* [Qemu-devel] [PATCH v2] ide: fix enum comparison for gcc 4.7
@ 2017-09-21 1:38 John Snow
2017-09-21 12:25 ` Stefan Hajnoczi
0 siblings, 1 reply; 3+ messages in thread
From: John Snow @ 2017-09-21 1:38 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mark.cave-ayland, John Snow
Apparently GCC gets bent over comparing enum values against zero.
Replace the conditional with something less readable.
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: John Snow <jsnow@redhat.com>
---
v2: Second verse, same as the first.
Signed-off-by: John Snow <jsnow@redhat.com>
---
hw/ide/ahci.c | 2 +-
hw/ide/core.c | 2 +-
include/hw/ide/internal.h | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 24c65df..32d1296 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -184,7 +184,7 @@ static void ahci_check_irq(AHCIState *s)
static void ahci_trigger_irq(AHCIState *s, AHCIDevice *d,
enum AHCIPortIRQ irqbit)
{
- g_assert(irqbit >= 0 && irqbit < 32);
+ g_assert((unsigned)irqbit < 32);
uint32_t irq = 1U << irqbit;
uint32_t irqstat = d->port_regs.irq_stat | irq;
diff --git a/hw/ide/core.c b/hw/ide/core.c
index a19bd90..d63eb4a 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -68,7 +68,7 @@ const char *IDE_DMA_CMD_lookup[IDE_DMA__COUNT] = {
static const char *IDE_DMA_CMD_str(enum ide_dma_cmd enval)
{
- if (enval >= IDE_DMA__BEGIN && enval < IDE_DMA__COUNT) {
+ if ((unsigned)enval < IDE_DMA__COUNT) {
return IDE_DMA_CMD_lookup[enval];
}
return "DMA UNKNOWN CMD";
diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
index 180e00e..e641012 100644
--- a/include/hw/ide/internal.h
+++ b/include/hw/ide/internal.h
@@ -333,8 +333,7 @@ struct unreported_events {
};
enum ide_dma_cmd {
- IDE_DMA__BEGIN = 0,
- IDE_DMA_READ = IDE_DMA__BEGIN,
+ IDE_DMA_READ = 0,
IDE_DMA_WRITE,
IDE_DMA_TRIM,
IDE_DMA_ATAPI,
--
2.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] ide: fix enum comparison for gcc 4.7
2017-09-21 1:38 [Qemu-devel] [PATCH v2] ide: fix enum comparison for gcc 4.7 John Snow
@ 2017-09-21 12:25 ` Stefan Hajnoczi
2017-09-22 13:03 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Hajnoczi @ 2017-09-21 12:25 UTC (permalink / raw)
To: John Snow; +Cc: qemu-devel, peter.maydell, mark.cave-ayland
On Wed, Sep 20, 2017 at 09:38:21PM -0400, John Snow wrote:
> Apparently GCC gets bent over comparing enum values against zero.
> Replace the conditional with something less readable.
>
> Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Signed-off-by: John Snow <jsnow@redhat.com>
>
> ---
>
> v2: Second verse, same as the first.
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
> hw/ide/ahci.c | 2 +-
> hw/ide/core.c | 2 +-
> include/hw/ide/internal.h | 3 +--
> 3 files changed, 3 insertions(+), 4 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] ide: fix enum comparison for gcc 4.7
2017-09-21 12:25 ` Stefan Hajnoczi
@ 2017-09-22 13:03 ` Peter Maydell
0 siblings, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2017-09-22 13:03 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: John Snow, QEMU Developers, Mark Cave-Ayland
On 21 September 2017 at 13:25, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> On Wed, Sep 20, 2017 at 09:38:21PM -0400, John Snow wrote:
>> Apparently GCC gets bent over comparing enum values against zero.
>> Replace the conditional with something less readable.
>>
>> Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>> Signed-off-by: John Snow <jsnow@redhat.com>
>>
>> ---
>>
>> v2: Second verse, same as the first.
>> Signed-off-by: John Snow <jsnow@redhat.com>
>> ---
>> hw/ide/ahci.c | 2 +-
>> hw/ide/core.c | 2 +-
>> include/hw/ide/internal.h | 3 +--
>> 3 files changed, 3 insertions(+), 4 deletions(-)
>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Thanks, applied to master as a buildfix.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-09-22 13:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-21 1:38 [Qemu-devel] [PATCH v2] ide: fix enum comparison for gcc 4.7 John Snow
2017-09-21 12:25 ` Stefan Hajnoczi
2017-09-22 13:03 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.