diff options
| author | Maciej S. Szmigiero <maciej.szmigiero@oracle.com> | 2023-11-06 13:53:59 +0100 |
|---|---|---|
| committer | Maciej S. Szmigiero <maciej.szmigiero@oracle.com> | 2023-11-06 13:53:59 +0100 |
| commit | 2d7f1081864790eb1000e6ef34e202dae66a03d2 (patch) | |
| tree | f7d949a47b6865fd192fc5eef3cc6e597b44aa4a /hw/virtio | |
| parent | 6c1b28e9e405da8cfb7296b9efa2b85650086784 (diff) | |
Revert "hw/virtio/virtio-pmem: Replace impossible check by assertion"
This reverts commit 5960f254dbb46f0c7a9f5f44bf4d27c19c34cb97 since the
previous commit made this situation possible again.
Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
Diffstat (limited to 'hw/virtio')
| -rw-r--r-- | hw/virtio/virtio-pmem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index cc24812d2e..c3512c2dae 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -147,7 +147,10 @@ static void virtio_pmem_fill_device_info(const VirtIOPMEM *pmem, static MemoryRegion *virtio_pmem_get_memory_region(VirtIOPMEM *pmem, Error **errp) { - assert(pmem->memdev); + if (!pmem->memdev) { + error_setg(errp, "'%s' property must be set", VIRTIO_PMEM_MEMDEV_PROP); + return NULL; + } return &pmem->memdev->mr; } |