* [Qemu-devel] [PATCH] pflash_cfi01: Fix warning caused by unreachable code
@ 2012-09-01 11:00 Stefan Weil
2012-09-20 16:57 ` Stefan Weil
2012-09-22 15:44 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Weil @ 2012-09-01 11:00 UTC (permalink / raw)
To: qemu-trivial; +Cc: Stefan Weil, qemu-devel
Report from smatch:
hw/pflash_cfi01.c:431 pflash_write(180) info: ignoring unreachable code.
Instead of removing the return statement after the switch statement,
the patch replaces the return statements in the switch statement by
break statements. Other switch statements in the same code do it also
like that.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
hw/pflash_cfi01.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index d1c7423..56ed33f 100644
--- a/hw/pflash_cfi01.c
+++ b/hw/pflash_cfi01.c
@@ -320,7 +320,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
}
pfl->wcycle++;
pfl->cmd = cmd;
- return;
+ break;
case 1:
switch (pfl->cmd) {
case 0x10: /* Single Byte Program */
@@ -375,7 +375,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
default:
goto error_flash;
}
- return;
+ break;
case 2:
switch (pfl->cmd) {
case 0xe8: /* Block write */
@@ -406,7 +406,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
default:
goto error_flash;
}
- return;
+ break;
case 3: /* Confirm mode */
switch (pfl->cmd) {
case 0xe8: /* Block write */
@@ -422,7 +422,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
default:
goto error_flash;
}
- return;
+ break;
default:
/* Should never happen */
DPRINTF("%s: invalid write state\n", __func__);
--
1.7.10
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] pflash_cfi01: Fix warning caused by unreachable code
2012-09-01 11:00 [Qemu-devel] [PATCH] pflash_cfi01: Fix warning caused by unreachable code Stefan Weil
@ 2012-09-20 16:57 ` Stefan Weil
2012-09-22 15:44 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Weil @ 2012-09-20 16:57 UTC (permalink / raw)
To: qemu-trivial; +Cc: qemu-devel
Am 01.09.2012 13:00, schrieb Stefan Weil:
> Report from smatch:
> hw/pflash_cfi01.c:431 pflash_write(180) info: ignoring unreachable code.
>
> Instead of removing the return statement after the switch statement,
> the patch replaces the return statements in the switch statement by
> break statements. Other switch statements in the same code do it also
> like that.
>
> Signed-off-by: Stefan Weil<sw@weilnetz.de>
> ---
> hw/pflash_cfi01.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
> index d1c7423..56ed33f 100644
> --- a/hw/pflash_cfi01.c
> +++ b/hw/pflash_cfi01.c
> @@ -320,7 +320,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
> }
> pfl->wcycle++;
> pfl->cmd = cmd;
> - return;
> + break;
> case 1:
> switch (pfl->cmd) {
> case 0x10: /* Single Byte Program */
> @@ -375,7 +375,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
> default:
> goto error_flash;
> }
> - return;
> + break;
> case 2:
> switch (pfl->cmd) {
> case 0xe8: /* Block write */
> @@ -406,7 +406,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
> default:
> goto error_flash;
> }
> - return;
> + break;
> case 3: /* Confirm mode */
> switch (pfl->cmd) {
> case 0xe8: /* Block write */
> @@ -422,7 +422,7 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
> default:
> goto error_flash;
> }
> - return;
> + break;
> default:
> /* Should never happen */
> DPRINTF("%s: invalid write state\n", __func__);
>
Ping?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH] pflash_cfi01: Fix warning caused by unreachable code
2012-09-01 11:00 [Qemu-devel] [PATCH] pflash_cfi01: Fix warning caused by unreachable code Stefan Weil
2012-09-20 16:57 ` Stefan Weil
@ 2012-09-22 15:44 ` Stefan Hajnoczi
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2012-09-22 15:44 UTC (permalink / raw)
To: Stefan Weil; +Cc: qemu-trivial, qemu-devel
On Sat, Sep 01, 2012 at 01:00:48PM +0200, Stefan Weil wrote:
> Report from smatch:
> hw/pflash_cfi01.c:431 pflash_write(180) info: ignoring unreachable code.
>
> Instead of removing the return statement after the switch statement,
> the patch replaces the return statements in the switch statement by
> break statements. Other switch statements in the same code do it also
> like that.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> hw/pflash_cfi01.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-22 15:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-01 11:00 [Qemu-devel] [PATCH] pflash_cfi01: Fix warning caused by unreachable code Stefan Weil
2012-09-20 16:57 ` Stefan Weil
2012-09-22 15:44 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).