diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-11 12:50:43 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-18 12:06:21 +0200 |
| commit | 469b046ead0671932ff3af8d6f95045b19b186ef (patch) | |
| tree | 2ea738741930efbd091bf7fc645ce785bd1ec7a1 /hw/block | |
| parent | d8d95814609e89e5438a3318a647ec322fc4ff16 (diff) | |
memory: remove memory_region_destroy
The function is empty after the previous patch, so remove it.
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/nvme.c | 1 | ||||
| -rw-r--r-- | hw/block/pflash_cfi01.c | 1 | ||||
| -rw-r--r-- | hw/block/pflash_cfi02.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 5fd8f89822..6d9a0651d8 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -839,7 +839,6 @@ static void nvme_exit(PCIDevice *pci_dev) g_free(n->cq); g_free(n->sq); msix_uninit_exclusive_bar(pci_dev); - memory_region_destroy(&n->iomem); } static Property nvme_props[] = { diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index f9507b4e5a..2238f39579 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -781,7 +781,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) if (ret < 0) { vmstate_unregister_ram(&pfl->mem, DEVICE(pfl)); - memory_region_destroy(&pfl->mem); error_setg(errp, "failed to read the initial flash content"); return; } diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 8d4b828edf..e196f4d94c 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -617,7 +617,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) ret = bdrv_read(pfl->bs, 0, pfl->storage, chip_len >> 9); if (ret < 0) { vmstate_unregister_ram(&pfl->orig_mem, DEVICE(pfl)); - memory_region_destroy(&pfl->orig_mem); error_setg(errp, "failed to read the initial flash content"); return; } |