aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2009-08-28 19:12:16 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-08-28 19:12:16 +0000
commit73538c31a8f2d5aba3d82d8e60dadcb40d59061b (patch)
treee7ddb1ec51185292d61d2ab2a18373add45a0803
parent1387fe4a95cc9e7b7fd997b7c676161bfac05c41 (diff)
Suppress kraxelisms
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--hw/isa-bus.c6
-rw-r--r--hw/qdev-properties.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 85ba354940..2843b5132c 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -137,10 +137,12 @@ ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2
isa->iobase[0] = iobase;
isa->iobase[1] = iobase2;
qdev_init(dev);
- if (-1 != irq)
+ if (irq != -1) {
isa_connect_irq(isa, 0, irq);
- if (-1 != irq2)
+ }
+ if (irq2 != -1) {
isa_connect_irq(isa, 1, irq2);
+ }
return isa;
}
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index c9703c261c..12ff46bf0b 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -273,7 +273,7 @@ static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest, size_t
{
uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
- if (-1 == *ptr) {
+ if (*ptr == -1) {
return snprintf(dest, len, "<unset>");
} else {
return snprintf(dest, len, "%02x.%x", *ptr >> 3, *ptr & 7);