github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-21 13:08:42 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fix compilation on Ubuntu 14.04"

Browse Source 
This reverts commit bc0579d0ff.

The commit bc0579d makes acrn-dm crashed when launch UOS.
Crash log:
./launch_UOS.sh: line 112:   377 Segmentation fault (core dumped) acrn-dm ...
dmesg log:
acrn-dm[1264]: segfault at 1f0 ip 0000000000412257 sp 00007fffc1af9920 error 6 in acrn-dm[400000+3d000]

After this patch reverted, UOS launched successfully.
This commit is contained in:
Qi Yadong 2018-04-11 12:06:40 +08:00 committed by Jack Ren
parent c5b14c2646
commit e86b01f57e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devicemodel/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 =0; uint32_t tfd;
uint8_t pc, code; uint8_t pc, code;
int len; int len;

8
devicemodel/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 *)((uint16_t *)pi->cfgdata + offset) = val; *(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 *)((uint32_t *)pi->cfgdata + offset) = val; *(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 *)((uint16_t *)pi->cfgdata + offset)); return (*(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 *)((uint32_t *)pi->cfgdata + offset)); return (*(uint32_t *)(pi->cfgdata + offset));
} }
#endif /* _PCI_CORE_H_ */ #endif /* _PCI_CORE_H_ */