| Message ID | 1435330053-18733-4-git-send-email-fred.konrad@greensocs.com |
|---|---|
| State | New |
| Headers | show |
On 26/06/2015 16:47, fred.konrad@greensocs.com wrote: > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index 7f0aae9..d1e482a 100755 > --- a/scripts/checkpatch.pl > +++ b/scripts/checkpatch.pl > @@ -2664,11 +2664,6 @@ sub process { > WARN("Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr); > } > > -# SPIN_LOCK_UNLOCKED & RW_LOCK_UNLOCKED are deprecated > - if ($line =~ /\b(SPIN_LOCK_UNLOCKED|RW_LOCK_UNLOCKED)/) { > - ERROR("Use of $1 is deprecated: see Documentation/spinlocks.txt\n" . $herecurr); > - } > - > # warn about #if 0 > if ($line =~ /^.\s*\#\s*if\s+0\b/) { > CHK("if this code is redundant consider removing it\n" . > @@ -2717,8 +2712,8 @@ sub process { > ERROR("exactly one space required after that #$1\n" . $herecurr); > } > > -# check for spinlock_t definitions without a comment. > - if ($line =~ /^.\s*(struct\s+mutex|spinlock_t)\s+\S+;/ || > +# check for mutex definitions without a comment. > + if ($line =~ /^.\s*(struct\s+mutex)\s+\S+;/ || > $line =~ /^.\s*(DEFINE_MUTEX)\s*\(/) { > my $which = $1; > if (!ctx_has_comment($first_line, $linenr)) { The checkpatch.pl parts simply come from Linux. They don't matter for QEMU, but we're limiting the changes to the minimum in this script. Paolo
On 26/06/2015 16:53, Paolo Bonzini wrote: > > On 26/06/2015 16:47, fred.konrad@greensocs.com wrote: >> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl >> index 7f0aae9..d1e482a 100755 >> --- a/scripts/checkpatch.pl >> +++ b/scripts/checkpatch.pl >> @@ -2664,11 +2664,6 @@ sub process { >> WARN("Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr); >> } >> >> -# SPIN_LOCK_UNLOCKED & RW_LOCK_UNLOCKED are deprecated >> - if ($line =~ /\b(SPIN_LOCK_UNLOCKED|RW_LOCK_UNLOCKED)/) { >> - ERROR("Use of $1 is deprecated: see Documentation/spinlocks.txt\n" . $herecurr); >> - } >> - >> # warn about #if 0 >> if ($line =~ /^.\s*\#\s*if\s+0\b/) { >> CHK("if this code is redundant consider removing it\n" . >> @@ -2717,8 +2712,8 @@ sub process { >> ERROR("exactly one space required after that #$1\n" . $herecurr); >> } >> >> -# check for spinlock_t definitions without a comment. >> - if ($line =~ /^.\s*(struct\s+mutex|spinlock_t)\s+\S+;/ || >> +# check for mutex definitions without a comment. >> + if ($line =~ /^.\s*(struct\s+mutex)\s+\S+;/ || >> $line =~ /^.\s*(DEFINE_MUTEX)\s*\(/) { >> my $which = $1; >> if (!ctx_has_comment($first_line, $linenr)) { > The checkpatch.pl parts simply come from Linux. They don't matter for > QEMU, but we're limiting the changes to the minimum in this script. > > Paolo Ok so I can drop this part from the patch? Thanks, Fred
On 26/06/2015 17:29, Frederic Konrad wrote: >> The checkpatch.pl parts simply come from Linux. They don't matter for >> QEMU, but we're limiting the changes to the minimum in this script. > > Ok so I can drop this part from the patch? Yes, please! Paolo
diff --git a/include/exec/spinlock.h b/include/exec/spinlock.h deleted file mode 100644 index a72edda..0000000 --- a/include/exec/spinlock.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2003 Fabrice Bellard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/> - */ - -/* configure guarantees us that we have pthreads on any host except - * mingw32, which doesn't support any of the user-only targets. - * So we can simply assume we have pthread mutexes here. - */ -#if defined(CONFIG_USER_ONLY) - -#include <pthread.h> -#define spin_lock pthread_mutex_lock -#define spin_unlock pthread_mutex_unlock -#define spinlock_t pthread_mutex_t -#define SPIN_LOCK_UNLOCKED PTHREAD_MUTEX_INITIALIZER - -#else - -/* Empty implementations, on the theory that system mode emulation - * is single-threaded. This means that these functions should only - * be used from code run in the TCG cpu thread, and cannot protect - * data structures which might also be accessed from the IO thread - * or from signal handlers. - */ -typedef int spinlock_t; -#define SPIN_LOCK_UNLOCKED 0 - -static inline void spin_lock(spinlock_t *lock) -{ -} - -static inline void spin_unlock(spinlock_t *lock) -{ -} - -#endif diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 7f0aae9..d1e482a 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2664,11 +2664,6 @@ sub process { WARN("Use of volatile is usually wrong: see Documentation/volatile-considered-harmful.txt\n" . $herecurr); } -# SPIN_LOCK_UNLOCKED & RW_LOCK_UNLOCKED are deprecated - if ($line =~ /\b(SPIN_LOCK_UNLOCKED|RW_LOCK_UNLOCKED)/) { - ERROR("Use of $1 is deprecated: see Documentation/spinlocks.txt\n" . $herecurr); - } - # warn about #if 0 if ($line =~ /^.\s*\#\s*if\s+0\b/) { CHK("if this code is redundant consider removing it\n" . @@ -2717,8 +2712,8 @@ sub process { ERROR("exactly one space required after that #$1\n" . $herecurr); } -# check for spinlock_t definitions without a comment. - if ($line =~ /^.\s*(struct\s+mutex|spinlock_t)\s+\S+;/ || +# check for mutex definitions without a comment. + if ($line =~ /^.\s*(struct\s+mutex)\s+\S+;/ || $line =~ /^.\s*(DEFINE_MUTEX)\s*\(/) { my $which = $1; if (!ctx_has_comment($first_line, $linenr)) {