system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-04 18:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu-char: Use g_new() & friends where that makes obvious sense

Browse source 
g_new(T, n) is neater than g_malloc(sizeof(T) * n).  It's also safer,
for two reasons.  One, it catches multiplication overflowing size_t.
Two, it returns T * rather than void *, which lets the compiler catch
more type errors.

This commit only touches allocations with size arguments of the form
sizeof(T).  Same Coccinelle semantic patch as in commit b45c03f.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1442231643-23630-1-git-send-email-armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Markus Armbruster 2015-09-14 13:54:03 +02:00 committed by Paolo Bonzini
parent 2cd8af2d44
commit 2d528d45ec
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backends/testdev.c
View file

@ -113,8 +113,8 @@ CharDriverState *chr_testdev_init(void)
TestdevCharState *testdev; TestdevCharState *testdev;
CharDriverState *chr; CharDriverState *chr;
testdev = g_malloc0(sizeof(TestdevCharState)); testdev = g_new0(TestdevCharState, 1);
testdev->chr = chr = g_malloc0(sizeof(CharDriverState)); testdev->chr = chr = g_new0(CharDriverState, 1);
chr->opaque = testdev; chr->opaque = testdev;
chr->chr_write = testdev_write; chr->chr_write = testdev_write;

22
qemu-char.c
View file

@ -685,7 +685,7 @@ static CharDriverState *qemu_chr_open_mux(CharDriverState *drv)
MuxDriver *d; MuxDriver *d;
chr = qemu_chr_alloc(); chr = qemu_chr_alloc();
d = g_malloc0(sizeof(MuxDriver)); d = g_new0(MuxDriver, 1);
chr->opaque = d; chr->opaque = d;
d->drv = drv; d->drv = drv;
@ -1064,7 +1064,7 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out)
FDCharDriver *s; FDCharDriver *s;
chr = qemu_chr_alloc(); chr = qemu_chr_alloc();
s = g_malloc0(sizeof(FDCharDriver)); s = g_new0(FDCharDriver, 1);
s->fd_in = io_channel_from_fd(fd_in); s->fd_in = io_channel_from_fd(fd_in);
s->fd_out = io_channel_from_fd(fd_out); s->fd_out = io_channel_from_fd(fd_out);
qemu_set_nonblock(fd_out); qemu_set_nonblock(fd_out);
@ -1413,7 +1413,7 @@ static CharDriverState *qemu_chr_open_pty(const char *id,
fprintf(stderr, "char device redirected to %s (label %s)\n", fprintf(stderr, "char device redirected to %s (label %s)\n",
pty_name, id); pty_name, id);
s = g_malloc0(sizeof(PtyCharDriver)); s = g_new0(PtyCharDriver, 1);
chr->opaque = s; chr->opaque = s;
chr->chr_write = pty_chr_write; chr->chr_write = pty_chr_write;
chr->chr_update_read_handler = pty_chr_update_read_handler; chr->chr_update_read_handler = pty_chr_update_read_handler;
@ -1762,7 +1762,7 @@ static CharDriverState *qemu_chr_open_pp_fd(int fd)
return NULL; return NULL;
} }
drv = g_malloc0(sizeof(ParallelCharDriver)); drv = g_new0(ParallelCharDriver, 1);
drv->fd = fd; drv->fd = fd;
drv->mode = IEEE1284_MODE_COMPAT; drv->mode = IEEE1284_MODE_COMPAT;
@ -2050,7 +2050,7 @@ static CharDriverState *qemu_chr_open_win_path(const char *filename)
WinCharState *s; WinCharState *s;
chr = qemu_chr_alloc(); chr = qemu_chr_alloc();
s = g_malloc0(sizeof(WinCharState)); s = g_new0(WinCharState, 1);
chr->opaque = s; chr->opaque = s;
chr->chr_write = win_chr_write; chr->chr_write = win_chr_write;
chr->chr_close = win_chr_close; chr->chr_close = win_chr_close;
@ -2149,7 +2149,7 @@ static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts)
WinCharState *s; WinCharState *s;
chr = qemu_chr_alloc(); chr = qemu_chr_alloc();
s = g_malloc0(sizeof(WinCharState)); s = g_new0(WinCharState, 1);
chr->opaque = s; chr->opaque = s;
chr->chr_write = win_chr_write; chr->chr_write = win_chr_write;
chr->chr_close = win_chr_close; chr->chr_close = win_chr_close;
@ -2168,7 +2168,7 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out)
WinCharState *s; WinCharState *s;
chr = qemu_chr_alloc(); chr = qemu_chr_alloc();
s = g_malloc0(sizeof(WinCharState)); s = g_new0(WinCharState, 1);
s->hcom = fd_out; s->hcom = fd_out;
chr->opaque = s; chr->opaque = s;
chr->chr_write = win_chr_write; chr->chr_write = win_chr_write;
@ -2324,7 +2324,7 @@ static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts)
int is_console = 0; int is_console = 0;
chr = qemu_chr_alloc(); chr = qemu_chr_alloc();
stdio = g_malloc0(sizeof(WinStdioCharState)); stdio = g_new0(WinStdioCharState, 1);
stdio->hStdIn = GetStdHandle(STD_INPUT_HANDLE); stdio->hStdIn = GetStdHandle(STD_INPUT_HANDLE);
if (stdio->hStdIn == INVALID_HANDLE_VALUE) { if (stdio->hStdIn == INVALID_HANDLE_VALUE) {
@ -2487,7 +2487,7 @@ static CharDriverState *qemu_chr_open_udp_fd(int fd)
NetCharDriver *s = NULL; NetCharDriver *s = NULL;
chr = qemu_chr_alloc(); chr = qemu_chr_alloc();
s = g_malloc0(sizeof(NetCharDriver)); s = g_new0(NetCharDriver, 1);
s->fd = fd; s->fd = fd;
s->chan = io_channel_from_socket(s->fd); s->chan = io_channel_from_socket(s->fd);
@ -2713,7 +2713,7 @@ static int tcp_set_msgfds(CharDriverState *chr, int *fds, int num)
g_free(s->write_msgfds); g_free(s->write_msgfds);
if (num) { if (num) {
s->write_msgfds = g_malloc(num * sizeof(int)); s->write_msgfds = g_new(int, num);
memcpy(s->write_msgfds, fds, num * sizeof(int)); memcpy(s->write_msgfds, fds, num * sizeof(int));
} }
@ -4144,7 +4144,7 @@ static CharDriverState *qmp_chardev_open_socket(ChardevSocket *sock,
int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0; int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0;
chr = qemu_chr_alloc(); chr = qemu_chr_alloc();
s = g_malloc0(sizeof(TCPCharDriver)); s = g_new0(TCPCharDriver, 1);
s->fd = -1; s->fd = -1;
s->listen_fd = -1; s->listen_fd = -1;