Skip to contentSkip to conversation

portability patches

PATCH In review Blue Swirl 2 participants 4 messages Jul 14, 2012 – Jul 17, 2012

lore
Share & tools
lore

Blue Swirl

author
#0 lore raw

v3 cover portability patches

I entertained myself by compiling QEMU with -std=c99 -pedantic and fixing some issues found with that.

v2->v3
Put :?, %m and asm patches to separate series.

v1->v2:
Fix copypasta in 1/5 (Anders Schwab)
Resent with correct address

Blue Swirl (2):
Avoid returning void
Avoid redefining inline

 block.c                |    2 +-
 dma.h                  |    6 +++---
 hw/bt-l2cap.c          |   11 +++++++----
 hw/eepro100.c          |   15 +++++++++++----
 hw/ide/cmd646.c        |    6 +++---
 hw/ide/piix.c          |    3 ++-
 hw/ide/via.c           |    3 ++-
 hw/lan9118.c           |    6 ++++--
 hw/ne2000.c            |    8 ++++----
 hw/vmware_vga.c        |    9 ++++++---
 osdep.h                |    2 ++
 ui/vnc-auth-vencrypt.c |    3 ++-
 ui/vnc.c               |    2 +-
 13 files changed, 48 insertions(+), 28 deletions(-)
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH v3 1/2 Avoid returning void

It's silly and non-conforming to standards to return void, don't do it.

Signed-off-by Blue Swirl <[email protected]>
---
 block.c                |    2 +-
 dma.h                  |    6 +++---
 hw/bt-l2cap.c          |   11 +++++++----
 hw/eepro100.c          |   15 +++++++++++----
 hw/ide/cmd646.c        |    6 +++---
 hw/ide/piix.c          |    3 ++-
 hw/ide/via.c           |    3 ++-
 hw/lan9118.c           |    6 ++++--
 hw/ne2000.c            |    8 ++++----
 hw/vmware_vga.c        |    9 ++++++---
 ui/vnc-auth-vencrypt.c |    3 ++-
 ui/vnc.c               |    2 +-
 12 files changed, 46 insertions(+), 28 deletions(-)
block.c +1 -1
index 0c923f2..7ff7a67 100644
@@ -2863,7 +2863,7 @@ void bdrv_debug_event(BlockDriverState *bs, BlkDebugEvent event)
         return;
     }
 
-    return drv->bdrv_debug_event(bs, event);
+    drv->bdrv_debug_event(bs, event);
 
 }
dma.h +3 -3
index acacf1b..f35c4b6 100644
@@ -196,9 +196,9 @@ static inline void dma_memory_unmap(DMAContext *dma,
                                     DMADirection dir, dma_addr_t access_len)
 {
     if (!dma_has_iommu(dma)) {
-        return cpu_physical_memory_unmap(buffer, (target_phys_addr_t)len,
-                                         dir == DMA_DIRECTION_FROM_DEVICE,
-                                         access_len);
+        cpu_physical_memory_unmap(buffer, (target_phys_addr_t)len,
+                                  dir == DMA_DIRECTION_FROM_DEVICE,
+                                  access_len);
     } else {
         iommu_dma_memory_unmap(dma, buffer, len, dir, access_len);
     }
hw/bt-l2cap.c +7 -4
index 2ccba60..cb43ee7 100644
@@ -1000,7 +1000,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid,
             /* TODO: Signal an error? */
             return;
         }
-        return l2cap_sframe_in(ch, le16_to_cpup((void *) hdr->data));
+        l2cap_sframe_in(ch, le16_to_cpup((void *) hdr->data));
+        return;
     }
 
     switch (hdr->data[1] >> 6) {	/* SAR */

@@ -1010,7 +1011,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid,
         if (len - 4 > ch->mps)
             goto len_error;
 
-        return ch->params.sdu_in(ch->params.opaque, hdr->data + 2, len - 4);
+        ch->params.sdu_in(ch->params.opaque, hdr->data + 2, len - 4);
+        break;
 
     case L2CAP_SAR_START:
         if (ch->len_total || len < 6)

@@ -1033,7 +1035,8 @@ static void l2cap_iframe_in(struct l2cap_chan_s *ch, uint16_t cid,
             goto len_error;
 
         memcpy(ch->sdu + ch->len_cur, hdr->data + 2, len - 4);
-        return ch->params.sdu_in(ch->params.opaque, ch->sdu, ch->len_total);
+        ch->params.sdu_in(ch->params.opaque, ch->sdu, ch->len_total);
+        break;
 
     case L2CAP_SAR_CONT:
         if (!ch->len_total || ch->len_cur + len - 4 >= ch->len_total)

@@ -1136,7 +1139,7 @@ static void l2cap_bframe_submit(struct bt_l2cap_conn_params_s *parms)
 {
     struct l2cap_chan_s *chan = (struct l2cap_chan_s *) parms;
 
-    return l2cap_pdu_submit(chan->l2cap);
+    l2cap_pdu_submit(chan->l2cap);
 }
 
 #if 0
hw/eepro100.c +11 -4
index 6279ae3..0f1f0f4 100644
@@ -1596,10 +1596,17 @@ static void eepro100_write(void *opaque, target_phys_addr_t addr,
     EEPRO100State *s = opaque;
 
     switch (size) {
-    case 1: return eepro100_write1(s, addr, data);
-    case 2: return eepro100_write2(s, addr, data);
-    case 4: return eepro100_write4(s, addr, data);
-    default: abort();
+    case 1:
+        eepro100_write1(s, addr, data);
+        break;
+    case 2:
+        eepro100_write2(s, addr, data);
+        break;
+    case 4:
+        eepro100_write4(s, addr, data);
+        break;
+    default:
+        abort();
     }
 }
hw/ide/cmd646.c +3 -3
index bf8ece4..087b4f9 100644
@@ -94,12 +94,12 @@ static void cmd646_data_write(void *opaque, target_phys_addr_t addr,
     CMD646BAR *cmd646bar = opaque;
 
     if (size == 1) {
-        return ide_ioport_write(cmd646bar->bus, addr, data);
+        ide_ioport_write(cmd646bar->bus, addr, data);
     } else if (addr == 0) {
         if (size == 2) {
-            return ide_data_writew(cmd646bar->bus, addr, data);
+            ide_data_writew(cmd646bar->bus, addr, data);
         } else {
-            return ide_data_writel(cmd646bar->bus, addr, data);
+            ide_data_writel(cmd646bar->bus, addr, data);
         }
     }
 }
hw/ide/piix.c +2 -1
index f5a74c2..6652761 100644
@@ -73,7 +73,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr,
 #endif
     switch(addr & 3) {
     case 0:
-        return bmdma_cmd_writeb(bm, val);
+        bmdma_cmd_writeb(bm, val);
+        break;
     case 2:
         bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06);
         break;
hw/ide/via.c +2 -1
index eec5136..a17f2e2 100644
@@ -74,7 +74,8 @@ static void bmdma_write(void *opaque, target_phys_addr_t addr,
 #endif
     switch (addr & 3) {
     case 0:
-        return bmdma_cmd_writeb(bm, val);
+        bmdma_cmd_writeb(bm, val);
+        break;
     case 2:
         bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06);
         break;
hw/lan9118.c +4 -2
index 7b4fe87..0c354e9 100644
@@ -1166,9 +1166,11 @@ static void lan9118_16bit_mode_write(void *opaque, target_phys_addr_t offset,
 {
     switch (size) {
     case 2:
-        return lan9118_writew(opaque, offset, (uint32_t)val);
+        lan9118_writew(opaque, offset, (uint32_t)val);
+        return;
     case 4:
-        return lan9118_writel(opaque, offset, val, size);
+        lan9118_writel(opaque, offset, val, size);
+        return;
     }
 
     hw_error("lan9118_write: Bad size 0x%x\n", size);
hw/ne2000.c +4 -4
index d02e60c..ccf7715 100644
@@ -677,15 +677,15 @@ static void ne2000_write(void *opaque, target_phys_addr_t addr,
     NE2000State *s = opaque;
 
     if (addr < 0x10 && size == 1) {
-        return ne2000_ioport_write(s, addr, data);
+        ne2000_ioport_write(s, addr, data);
     } else if (addr == 0x10) {
         if (size <= 2) {
-            return ne2000_asic_ioport_write(s, addr, data);
+            ne2000_asic_ioport_write(s, addr, data);
         } else {
-            return ne2000_asic_ioport_writel(s, addr, data);
+            ne2000_asic_ioport_writel(s, addr, data);
         }
     } else if (addr == 0x1f && size == 1) {
-        return ne2000_reset_ioport_write(s, addr, data);
+        ne2000_reset_ioport_write(s, addr, data);
     }
 }
hw/vmware_vga.c +6 -3
index 476dc89..f5e4f44 100644
@@ -1150,11 +1150,14 @@ static void vmsvga_io_write(void *opaque, target_phys_addr_t addr,
 
     switch (addr) {
     case SVGA_IO_MUL * SVGA_INDEX_PORT:
-        return vmsvga_index_write(s, addr, data);
+        vmsvga_index_write(s, addr, data);
+        break;
     case SVGA_IO_MUL * SVGA_VALUE_PORT:
-        return vmsvga_value_write(s, addr, data);
+        vmsvga_value_write(s, addr, data);
+        break;
     case SVGA_IO_MUL * SVGA_BIOS_PORT:
-        return vmsvga_bios_write(s, addr, data);
+        vmsvga_bios_write(s, addr, data);
+        break;
     }
 }
ui/vnc-auth-vencrypt.c +2 -1
index 674ba97..c59b188 100644
@@ -47,7 +47,8 @@ static void start_auth_vencrypt_subauth(VncState *vs)
     case VNC_AUTH_VENCRYPT_TLSSASL:
     case VNC_AUTH_VENCRYPT_X509SASL:
       VNC_DEBUG("Start TLS auth SASL\n");
-      return start_auth_sasl(vs);
+      start_auth_sasl(vs);
+      break;
 #endif /* CONFIG_VNC_SASL */
 
     default: /* Should not be possible, but just in case */
ui/vnc.c +1 -1
index cf1cae2..cfc61a7 100644
@@ -3089,5 +3089,5 @@ void vnc_display_add_client(DisplayState *ds, int csock, int skipauth)
 {
     VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
 
-    return vnc_connect(vs, csock, skipauth);
+    vnc_connect(vs, csock, skipauth);
 }
Signature · 1 line
1.7.2.5
author
#2 lore raw

PATCH v3 2/2 Avoid redefining inline

In reply to Blue Swirl

System headers (e.g. gutils.h) may define 'inline', #undefine it before #defining.

Signed-off-by Blue Swirl <[email protected]>
---
 osdep.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
osdep.h +2 -0
index 3ea4af0..1e15a4b 100644
@@ -70,10 +70,12 @@ typedef signed int              int_fast16_t;
 #ifndef always_inline
 #if !((__GNUC__ < 3) || defined(__APPLE__))
 #ifdef __OPTIMIZE__
+#undef inline
 #define inline __attribute__ (( always_inline )) __inline__
 #endif
 #endif
 #else
+#undef inline
 #define inline always_inline
 #endif
Signature · 1 line
1.7.2.5