diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index a08fcac9f767b8e885019196cf050b6aff435cb1..e05491308c9b3254d2cfe01112e412bd2bfd3af1 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -93,6 +93,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ if test $lv_cv_gcc_pragma_push_works = no; then dontwarn="$dontwarn -Wmissing-prototypes" dontwarn="$dontwarn -Wmissing-declarations" + dontwarn="$dontwarn -Wcast-align" fi dnl Check whether strchr(s, char variable) causes a bogus compile diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index e63a04b52ac1b60ad2b14a8d5baadca5cb4ce93e..b61010df69d472f82c91ce4d190af4eb7fd05f2b 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -1803,7 +1803,9 @@ virNWFilterRuleDetailsParse(xmlNodePtr node, while (att[idx].name != NULL) { prop = virXMLPropString(node, att[idx].name); + VIR_WARNINGS_NO_CAST_ALIGN item = (nwItemDesc *)((char *)nwf + att[idx].dataIdx); + VIR_WARNINGS_RESET flags = &item->flags; flags_set = match_flag; @@ -3235,7 +3237,9 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, nwItemDesc *item; while (att[i].name) { + VIR_WARNINGS_NO_CAST_ALIGN item = (nwItemDesc *)((char *)def + att[i].dataIdx); + VIR_WARNINGS_RESET enum virNWFilterEntryItemFlags flags = item->flags; if ((flags & NWFILTER_ENTRY_ITEM_FLAG_EXISTS)) { if (!typeShown) { diff --git a/src/internal.h b/src/internal.h index 2cf4731919b8d5fc42a5f196c1573756db739940..d819aa39a2b8aecc8419f37b6052f63b7c4ead2a 100644 --- a/src/internal.h +++ b/src/internal.h @@ -214,6 +214,19 @@ # endif # endif /* __GNUC__ */ + +# if __GNUC_PREREQ (4, 6) +# define VIR_WARNINGS_NO_CAST_ALIGN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wcast-align\"") + +# define VIR_WARNINGS_RESET \ + _Pragma ("GCC diagnostic pop") +# else +# define VIR_WARNINGS_NO_CAST_ALIGN +# define VIR_WARNINGS_RESET +# endif + /* * Use this when passing possibly-NULL strings to printf-a-likes. */ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 512406907843cee568d025cfbd227983ad65d1f2..5012b14d17b937a9052738c92516b79e49218cc7 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -991,7 +991,9 @@ virNWFilterSnoopDHCPDecode(virNWFilterSnoopReqPtr req, /* go through the protocol headers */ switch (ntohs(pep->eh_type)) { case ETHERTYPE_IP: + VIR_WARNINGS_NO_CAST_ALIGN; pip = (struct iphdr *) pep->eh_data; + VIR_WARNINGS_RESET; len -= offsetof(virNWFilterSnoopEthHdr, eh_data); break; default: @@ -1001,7 +1003,9 @@ virNWFilterSnoopDHCPDecode(virNWFilterSnoopReqPtr req, if (len < 0) return -2; + VIR_WARNINGS_NO_CAST_ALIGN pup = (struct udphdr *) ((char *) pip + (pip->ihl << 2)); + VIR_WARNINGS_RESET len -= pip->ihl << 2; if (len < 0) return -2; diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 7a4f98389186ac66d1316f0e2f9cb7741f75dd70..b399092ef043e0d0a1c09ca455b1c75edee6d791 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -324,7 +324,9 @@ procDHCPOpts(struct dhcp *dhcp, int dhcp_opts_len, case DHCP_OPT_BCASTADDRESS: /* Broadcast address */ if (dhcp_opts_len >= 6) { + VIR_WARNINGS_NO_CAST_ALIGN uint32_t *tmp = (uint32_t *)&dhcpopt->value; + VIR_WARNINGS_RESET (*bcastaddr) = ntohl(*tmp); } break; @@ -498,8 +500,10 @@ learnIPAddressThread(void *arg) if (etherType == ETHERTYPE_IP && (header.len >= ethHdrSize + sizeof(struct iphdr))) { + VIR_WARNINGS_NO_CAST_ALIGN struct iphdr *iphdr = (struct iphdr*)(packet + ethHdrSize); + VIR_WARNINGS_RESET vmaddr = iphdr->saddr; /* skip mcast addresses (224.0.0.0 - 239.255.255.255), * class E (240.0.0.0 - 255.255.255.255, includes eth. @@ -514,8 +518,10 @@ learnIPAddressThread(void *arg) } else if (etherType == ETHERTYPE_ARP && (header.len >= ethHdrSize + sizeof(struct f_arphdr))) { + VIR_WARNINGS_NO_CAST_ALIGN struct f_arphdr *arphdr = (struct f_arphdr*)(packet + ethHdrSize); + VIR_WARNINGS_RESET switch (ntohs(arphdr->arphdr.ar_op)) { case ARPOP_REPLY: vmaddr = arphdr->ar_sip; @@ -535,14 +541,18 @@ learnIPAddressThread(void *arg) if (etherType == ETHERTYPE_IP && (header.len >= ethHdrSize + sizeof(struct iphdr))) { + VIR_WARNINGS_NO_CAST_ALIGN struct iphdr *iphdr = (struct iphdr*)(packet + ethHdrSize); + VIR_WARNINGS_RESET if ((iphdr->protocol == IPPROTO_UDP) && (header.len >= ethHdrSize + iphdr->ihl * 4 + sizeof(struct udphdr))) { + VIR_WARNINGS_NO_CAST_ALIGN struct udphdr *udphdr= (struct udphdr *) ((char *)iphdr + iphdr->ihl * 4); + VIR_WARNINGS_RESET if (ntohs(udphdr->source) == 67 && ntohs(udphdr->dest) == 68 && header.len >= ethHdrSize + diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index b12b81f0d10f104442059bc6b9b633389512374b..60490634f8b9ff822a608777efdaab3771a23fc4 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -243,8 +243,10 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, /* Given the way libdevmapper returns its data, I don't see * any way to avoid this series of casts. */ + VIR_WARNINGS_NO_CAST_ALIGN next = names->next; names = (struct dm_names *)(((char *)names) + next); + VIR_WARNINGS_RESET } while (next);