From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v5 4/5] xen: Misc cleanup as a result of the previous patches Date: Fri, 28 Feb 2014 18:07:53 +0000 Message-ID: <1393610874-27492-5-git-send-email-andrew.cooper3@citrix.com> References: <1393610874-27492-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1393610874-27492-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper List-Id: xen-devel@lists.xenproject.org This includes: * A stale comment in sh_skip_sync() * A dead for ever loop in __bug() * A prototype for machine_power_off() which unimplemented in any architecture * Replacing a for(;;); loop with unreachable() Signed-off-by: Andrew Cooper Acked-by: Keir Fraser Reviewed-by: Jan Beulich --- xen/arch/x86/efi/boot.c | 2 +- xen/arch/x86/mm/shadow/common.c | 1 - xen/drivers/char/console.c | 1 - xen/include/xen/shutdown.h | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index a26e0af..62c4812 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -201,7 +201,7 @@ static void __init noreturn blexit(const CHAR16 *str) efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size)); efi_bs->Exit(efi_ih, EFI_SUCCESS, 0, NULL); - for( ; ; ); /* not reached */ + unreachable(); /* not reached */ } /* generic routine for printing error messages */ diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 11c6b62..b400ccb 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -875,7 +875,6 @@ static int sh_skip_sync(struct vcpu *v, mfn_t gl1mfn) SHADOW_ERROR("gmfn %#lx was OOS but not shadowed as an l1.\n", mfn_x(gl1mfn)); BUG(); - return 0; /* BUG() is no longer __attribute__((noreturn)). */ } diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 532c426..7d4383c 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1089,7 +1089,6 @@ void __bug(char *file, int line) printk("Xen BUG at %s:%d\n", file, line); dump_execution_state(); panic("Xen BUG at %s:%d", file, line); - for ( ; ; ) ; } void __warn(char *file, int line) diff --git a/xen/include/xen/shutdown.h b/xen/include/xen/shutdown.h index f04905b..a00bfef 100644 --- a/xen/include/xen/shutdown.h +++ b/xen/include/xen/shutdown.h @@ -10,6 +10,5 @@ void noreturn dom0_shutdown(u8 reason); void noreturn machine_restart(unsigned int delay_millisecs); void noreturn machine_halt(void); -void machine_power_off(void); #endif /* __XEN_SHUTDOWN_H__ */ -- 1.7.10.4