OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compilation on Ubuntu 14.04 

A couple of problems appeared on Ubuntu 14.04 (gcc 4.8.4) when we
turned on additional compiler flags with commit
519c4285cf104a594776591075ee1c6ee4d61815a. This patch fixes these
problems by adhering to the strict anti-aliasing rules and also
initializing the 'tfd' variable where the compile believed it
_could_ be used uninitialized.

Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Geoffroy Van Cutsem 2018-04-09 13:53:27 +02:00 committed by lijinxia
parent 58d31097e5
commit bc0579d0ff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/pci/ahci.c
View File

@ -1478,7 +1478,7 @@ static void
atapi_mode_sense(struct ahci_port *p, int slot, uint8_t *cfis) atapi_mode_sense(struct ahci_port *p, int slot, uint8_t *cfis)
{ {
uint8_t *acmd; uint8_t *acmd;
uint32_t tfd; uint32_t tfd =0;
uint8_t pc, code; uint8_t pc, code;
int len; int len;

8
include/pci_core.h
View File

@ -270,14 +270,14 @@ static inline void
pci_set_cfgdata16(struct pci_vdev *pi, int offset, uint16_t val) pci_set_cfgdata16(struct pci_vdev *pi, int offset, uint16_t val)
{ {
assert(offset <= (PCI_REGMAX - 1) && (offset & 1) == 0); assert(offset <= (PCI_REGMAX - 1) && (offset & 1) == 0);
*(uint16_t *)(pi->cfgdata + offset) = val; *(uint16_t *)((uint16_t *)pi->cfgdata + offset) = val;
} }
static inline void static inline void
pci_set_cfgdata32(struct pci_vdev *pi, int offset, uint32_t val) pci_set_cfgdata32(struct pci_vdev *pi, int offset, uint32_t val)
{ {
assert(offset <= (PCI_REGMAX - 3) && (offset & 3) == 0); assert(offset <= (PCI_REGMAX - 3) && (offset & 3) == 0);
*(uint32_t *)(pi->cfgdata + offset) = val; *(uint32_t *)((uint32_t *)pi->cfgdata + offset) = val;
} }
static inline uint8_t static inline uint8_t
@ -291,14 +291,14 @@ static inline uint16_t
pci_get_cfgdata16(struct pci_vdev *pi, int offset) pci_get_cfgdata16(struct pci_vdev *pi, int offset)
{ {
assert(offset <= (PCI_REGMAX - 1) && (offset & 1) == 0); assert(offset <= (PCI_REGMAX - 1) && (offset & 1) == 0);
return (*(uint16_t *)(pi->cfgdata + offset)); return (*(uint16_t *)((uint16_t *)pi->cfgdata + offset));
} }
static inline uint32_t static inline uint32_t
pci_get_cfgdata32(struct pci_vdev *pi, int offset) pci_get_cfgdata32(struct pci_vdev *pi, int offset)
{ {
assert(offset <= (PCI_REGMAX - 3) && (offset & 3) == 0); assert(offset <= (PCI_REGMAX - 3) && (offset & 3) == 0);
return (*(uint32_t *)(pi->cfgdata + offset)); return (*(uint32_t *)((uint32_t *)pi->cfgdata + offset));
} }
#endif /* _PCI_CORE_H_ */ #endif /* _PCI_CORE_H_ */