ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix miscellaneous minor things, by Andre Przywara. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3826 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-12-17 03:15:52 +00:00
parent 96b8f136f5
commit 69b349765c
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aes.c
View File

@ -30,7 +30,10 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "aes.h" #include "aes.h"
#ifndef NDEBUG
#define NDEBUG #define NDEBUG
#endif
#include <assert.h> #include <assert.h>
typedef uint32_t u32; typedef uint32_t u32;

1
hw/adlib.c
View File

@ -26,6 +26,7 @@
#include "hw.h" #include "hw.h"
#include "audiodev.h" #include "audiodev.h"
#include "audio/audio.h" #include "audio/audio.h"
#include "isa.h"
//#define DEBUG //#define DEBUG

3
hw/ide.c
View File

@ -430,8 +430,7 @@ static void padstr(char *str, const char *src, int len)
v = *src++; v = *src++;
else else
v = ' '; v = ' ';
*(char *)((long)str ^ 1) = v; str[i^1] = v;
str++;
} }
} }

8
hw/pcnet.c
View File

@ -350,8 +350,8 @@ static inline void pcnet_tmd_load(PCNetState *s, struct pcnet_TMD *tmd,
} else { } else {
s->phys_mem_read(s->dma_opaque, addr, (void *)tmd, sizeof(*tmd), 0); s->phys_mem_read(s->dma_opaque, addr, (void *)tmd, sizeof(*tmd), 0);
le32_to_cpus(&tmd->tbadr); le32_to_cpus(&tmd->tbadr);
le16_to_cpus(&tmd->length); le16_to_cpus((uint16_t *)&tmd->length);
le16_to_cpus(&tmd->status); le16_to_cpus((uint16_t *)&tmd->status);
le32_to_cpus(&tmd->misc); le32_to_cpus(&tmd->misc);
le32_to_cpus(&tmd->res); le32_to_cpus(&tmd->res);
if (BCR_SWSTYLE(s) == 3) { if (BCR_SWSTYLE(s) == 3) {
@ -416,8 +416,8 @@ static inline void pcnet_rmd_load(PCNetState *s, struct pcnet_RMD *rmd,
} else { } else {
s->phys_mem_read(s->dma_opaque, addr, (void *)rmd, sizeof(*rmd), 0); s->phys_mem_read(s->dma_opaque, addr, (void *)rmd, sizeof(*rmd), 0);
le32_to_cpus(&rmd->rbadr); le32_to_cpus(&rmd->rbadr);
le16_to_cpus(&rmd->buf_length); le16_to_cpus((uint16_t *)&rmd->buf_length);
le16_to_cpus(&rmd->status); le16_to_cpus((uint16_t *)&rmd->status);
le32_to_cpus(&rmd->msg_length); le32_to_cpus(&rmd->msg_length);
le32_to_cpus(&rmd->res); le32_to_cpus(&rmd->res);
if (BCR_SWSTYLE(s) == 3) { if (BCR_SWSTYLE(s) == 3) {

2
monitor.c
View File

@ -1824,7 +1824,7 @@ static int64_t expr_unary(void)
case '$': case '$':
{ {
char buf[128], *q; char buf[128], *q;
target_long reg; target_long reg=0;
pch++; pch++;
q = buf; q = buf;

3
vl.c
View File

@ -4423,7 +4423,8 @@ static NetSocketState *net_socket_fd_init(VLANState *vlan, int fd,
{ {
int so_type=-1, optlen=sizeof(so_type); int so_type=-1, optlen=sizeof(so_type);
if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type, &optlen)< 0) { if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
(socklen_t *)&optlen)< 0) {
fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n", fd); fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n", fd);
return NULL; return NULL;
} }