Revision 7267c094 block/rbd.c
b/block/rbd.c | ||
---|---|---|
138 | 138 |
return -EINVAL; |
139 | 139 |
} |
140 | 140 |
|
141 |
buf = qemu_strdup(start);
|
|
141 |
buf = g_strdup(start);
|
|
142 | 142 |
p = buf; |
143 | 143 |
*snap = '\0'; |
144 | 144 |
*conf = '\0'; |
... | ... | |
165 | 165 |
ret = qemu_rbd_next_tok(conf, conf_len, p, '\0', "configuration", &p); |
166 | 166 |
|
167 | 167 |
done: |
168 |
qemu_free(buf);
|
|
168 |
g_free(buf);
|
|
169 | 169 |
return ret; |
170 | 170 |
} |
171 | 171 |
|
... | ... | |
176 | 176 |
char value[RBD_MAX_CONF_VAL_SIZE]; |
177 | 177 |
int ret = 0; |
178 | 178 |
|
179 |
buf = qemu_strdup(conf);
|
|
179 |
buf = g_strdup(conf);
|
|
180 | 180 |
p = buf; |
181 | 181 |
|
182 | 182 |
while (p) { |
... | ... | |
214 | 214 |
} |
215 | 215 |
} |
216 | 216 |
|
217 |
qemu_free(buf);
|
|
217 |
g_free(buf);
|
|
218 | 218 |
return ret; |
219 | 219 |
} |
220 | 220 |
|
... | ... | |
341 | 341 |
acb->bh = qemu_bh_new(rbd_aio_bh_cb, acb); |
342 | 342 |
qemu_bh_schedule(acb->bh); |
343 | 343 |
done: |
344 |
qemu_free(rcb);
|
|
344 |
g_free(rcb);
|
|
345 | 345 |
} |
346 | 346 |
|
347 | 347 |
/* |
... | ... | |
395 | 395 |
} |
396 | 396 |
s->snap = NULL; |
397 | 397 |
if (snap_buf[0] != '\0') { |
398 |
s->snap = qemu_strdup(snap_buf);
|
|
398 |
s->snap = g_strdup(snap_buf);
|
|
399 | 399 |
} |
400 | 400 |
|
401 | 401 |
r = rados_create(&s->cluster, NULL); |
... | ... | |
478 | 478 |
|
479 | 479 |
rbd_close(s->image); |
480 | 480 |
rados_ioctx_destroy(s->io_ctx); |
481 |
qemu_free(s->snap);
|
|
481 |
g_free(s->snap);
|
|
482 | 482 |
rados_shutdown(s->cluster); |
483 | 483 |
} |
484 | 484 |
|
... | ... | |
544 | 544 |
ret = qemu_rbd_send_pipe(rcb->s, rcb); |
545 | 545 |
if (ret < 0) { |
546 | 546 |
error_report("failed writing to acb->s->fds"); |
547 |
qemu_free(rcb);
|
|
547 |
g_free(rcb);
|
|
548 | 548 |
} |
549 | 549 |
} |
550 | 550 |
|
... | ... | |
605 | 605 |
|
606 | 606 |
s->qemu_aio_count++; /* All the RADOSCB */ |
607 | 607 |
|
608 |
rcb = qemu_malloc(sizeof(RADOSCB));
|
|
608 |
rcb = g_malloc(sizeof(RADOSCB));
|
|
609 | 609 |
rcb->done = 0; |
610 | 610 |
rcb->acb = acb; |
611 | 611 |
rcb->buf = buf; |
... | ... | |
629 | 629 |
return &acb->common; |
630 | 630 |
|
631 | 631 |
failed: |
632 |
qemu_free(rcb);
|
|
632 |
g_free(rcb);
|
|
633 | 633 |
s->qemu_aio_count--; |
634 | 634 |
qemu_aio_release(acb); |
635 | 635 |
return NULL; |
... | ... | |
739 | 739 |
int max_snaps = RBD_MAX_SNAPS; |
740 | 740 |
|
741 | 741 |
do { |
742 |
snaps = qemu_malloc(sizeof(*snaps) * max_snaps);
|
|
742 |
snaps = g_malloc(sizeof(*snaps) * max_snaps);
|
|
743 | 743 |
snap_count = rbd_snap_list(s->image, snaps, &max_snaps); |
744 | 744 |
if (snap_count < 0) { |
745 |
qemu_free(snaps);
|
|
745 |
g_free(snaps);
|
|
746 | 746 |
} |
747 | 747 |
} while (snap_count == -ERANGE); |
748 | 748 |
|
... | ... | |
750 | 750 |
return snap_count; |
751 | 751 |
} |
752 | 752 |
|
753 |
sn_tab = qemu_mallocz(snap_count * sizeof(QEMUSnapshotInfo));
|
|
753 |
sn_tab = g_malloc0(snap_count * sizeof(QEMUSnapshotInfo));
|
|
754 | 754 |
|
755 | 755 |
for (i = 0; i < snap_count; i++) { |
756 | 756 |
const char *snap_name = snaps[i].name; |
Also available in: Unified diff