mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
toplevel: remove error handling from qemu_malloc() callers (Avi Kivity)
Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6531 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
0d0266a53b
commit
1eec614b36
25 changed files with 25 additions and 254 deletions
19
savevm.c
19
savevm.c
|
@ -214,10 +214,6 @@ QEMUFile *qemu_popen(FILE *popen_file, const char *mode)
|
|||
}
|
||||
|
||||
s = qemu_mallocz(sizeof(QEMUFilePopen));
|
||||
if (!s) {
|
||||
fprintf(stderr, "qemu_popen: malloc failed\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
s->popen_file = popen_file;
|
||||
|
||||
|
@ -246,9 +242,6 @@ QEMUFile *qemu_fopen_socket(int fd)
|
|||
{
|
||||
QEMUFileSocket *s = qemu_mallocz(sizeof(QEMUFileSocket));
|
||||
|
||||
if (s == NULL)
|
||||
return NULL;
|
||||
|
||||
s->fd = fd;
|
||||
s->file = qemu_fopen_ops(s, NULL, socket_get_buffer, socket_close, NULL);
|
||||
return s->file;
|
||||
|
@ -288,8 +281,6 @@ QEMUFile *qemu_fopen(const char *filename, const char *mode)
|
|||
QEMUFileStdio *s;
|
||||
|
||||
s = qemu_mallocz(sizeof(QEMUFileStdio));
|
||||
if (!s)
|
||||
return NULL;
|
||||
|
||||
s->outfile = fopen(filename, mode);
|
||||
if (!s->outfile)
|
||||
|
@ -339,8 +330,6 @@ static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int64_t offset, int is_wr
|
|||
QEMUFileBdrv *s;
|
||||
|
||||
s = qemu_mallocz(sizeof(QEMUFileBdrv));
|
||||
if (!s)
|
||||
return NULL;
|
||||
|
||||
s->bs = bs;
|
||||
s->base_offset = offset;
|
||||
|
@ -359,8 +348,6 @@ QEMUFile *qemu_fopen_ops(void *opaque, QEMUFilePutBufferFunc *put_buffer,
|
|||
QEMUFile *f;
|
||||
|
||||
f = qemu_mallocz(sizeof(QEMUFile));
|
||||
if (!f)
|
||||
return NULL;
|
||||
|
||||
f->opaque = opaque;
|
||||
f->put_buffer = put_buffer;
|
||||
|
@ -615,8 +602,6 @@ int register_savevm_live(const char *idstr,
|
|||
static int global_section_id;
|
||||
|
||||
se = qemu_malloc(sizeof(SaveStateEntry));
|
||||
if (!se)
|
||||
return -1;
|
||||
pstrcpy(se->idstr, sizeof(se->idstr), idstr);
|
||||
se->instance_id = (instance_id == -1) ? 0 : instance_id;
|
||||
se->version_id = version_id;
|
||||
|
@ -908,10 +893,6 @@ int qemu_loadvm_state(QEMUFile *f)
|
|||
|
||||
/* Add entry */
|
||||
le = qemu_mallocz(sizeof(*le));
|
||||
if (le == NULL) {
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
le->se = se;
|
||||
le->section_id = section_id;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue