diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-17 06:48:47 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-17 06:48:47 -0600 |
| commit | a19255a369f0ef34dfbbc1ed2631e68fbbebb8ce (patch) | |
| tree | 05f8b834115ee014363bae7099cd558a1d55f0b1 /hw/virtio.c | |
| parent | 9de36b1a7cf61aa8be365f13c81668b3e19fbc7f (diff) | |
| parent | 3a0c6c4ad6f97931f1d9a729322cb1612218ed96 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
linux-user: brk() debugging
virtio: Remove unneeded g_free() check in virtio_cleanup()
net: remove extra spaces in help messages
fmopl: Fix typo in function name
vl.c: Fix typo in variable name
ide: fix compilation errors when DEBUG_IDE is set
cpu-exec.c: Correct comment about this file and indentation cleanup
CODING_STYLE: Clarify style for enum and function type names
linux-user: fail execve() if env/args too big
Diffstat (limited to 'hw/virtio.c')
| -rw-r--r-- | hw/virtio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/virtio.c b/hw/virtio.c index 74cc038af9..064aecf553 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -845,8 +845,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f) void virtio_cleanup(VirtIODevice *vdev) { qemu_del_vm_change_state_handler(vdev->vmstate); - if (vdev->config) - g_free(vdev->config); + g_free(vdev->config); g_free(vdev->vq); g_free(vdev); } |