Revision 7267c094 hw/virtio.c
b/hw/virtio.c | ||
---|---|---|
832 | 832 |
{ |
833 | 833 |
qemu_del_vm_change_state_handler(vdev->vmstate); |
834 | 834 |
if (vdev->config) |
835 |
qemu_free(vdev->config);
|
|
836 |
qemu_free(vdev->vq);
|
|
837 |
qemu_free(vdev);
|
|
835 |
g_free(vdev->config);
|
|
836 |
g_free(vdev->vq);
|
|
837 |
g_free(vdev);
|
|
838 | 838 |
} |
839 | 839 |
|
840 | 840 |
static void virtio_vmstate_change(void *opaque, int running, int reason) |
... | ... | |
862 | 862 |
VirtIODevice *vdev; |
863 | 863 |
int i; |
864 | 864 |
|
865 |
vdev = qemu_mallocz(struct_size);
|
|
865 |
vdev = g_malloc0(struct_size);
|
|
866 | 866 |
|
867 | 867 |
vdev->device_id = device_id; |
868 | 868 |
vdev->status = 0; |
869 | 869 |
vdev->isr = 0; |
870 | 870 |
vdev->queue_sel = 0; |
871 | 871 |
vdev->config_vector = VIRTIO_NO_VECTOR; |
872 |
vdev->vq = qemu_mallocz(sizeof(VirtQueue) * VIRTIO_PCI_QUEUE_MAX);
|
|
872 |
vdev->vq = g_malloc0(sizeof(VirtQueue) * VIRTIO_PCI_QUEUE_MAX);
|
|
873 | 873 |
vdev->vm_running = vm_running; |
874 | 874 |
for(i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { |
875 | 875 |
vdev->vq[i].vector = VIRTIO_NO_VECTOR; |
... | ... | |
879 | 879 |
vdev->name = name; |
880 | 880 |
vdev->config_len = config_size; |
881 | 881 |
if (vdev->config_len) |
882 |
vdev->config = qemu_mallocz(config_size);
|
|
882 |
vdev->config = g_malloc0(config_size);
|
|
883 | 883 |
else |
884 | 884 |
vdev->config = NULL; |
885 | 885 |
|
Also available in: Unified diff