[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/10] Revert "hw/virtio/virtio-pmem: Replace impossible check by
|
From: |
Maciej S. Szmigiero |
|
Subject: |
[PULL 02/10] Revert "hw/virtio/virtio-pmem: Replace impossible check by assertion" |
|
Date: |
Mon, 6 Nov 2023 15:20:46 +0100 |
From: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>
This reverts commit 5960f254dbb46f0c7a9f5f44bf4d27c19c34cb97 since the
previous commit made this situation possible again.
Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
---
hw/virtio/virtio-pmem.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
index cc24812d2e92..c3512c2dae3f 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;
}
- [PULL 00/10] Hyper-V Dynamic Memory Protocol driver (hv-balloon) pull req fixed, Maciej S. Szmigiero, 2023/11/06
- [PULL 02/10] Revert "hw/virtio/virtio-pmem: Replace impossible check by assertion",
Maciej S. Szmigiero <=
- [PULL 01/10] memory-device: Support empty memory devices, Maciej S. Szmigiero, 2023/11/06
- [PULL 03/10] memory-device: Drop size alignment check, Maciej S. Szmigiero, 2023/11/06
- [PULL 04/10] Add Hyper-V Dynamic Memory Protocol definitions, Maciej S. Szmigiero, 2023/11/06
- [PULL 05/10] Add Hyper-V Dynamic Memory Protocol driver (hv-balloon) base, Maciej S. Szmigiero, 2023/11/06
- [PULL 06/10] Add Hyper-V Dynamic Memory Protocol driver (hv-balloon) hot-add support, Maciej S. Szmigiero, 2023/11/06
- [PULL 07/10] qapi: Add query-memory-devices support to hv-balloon, Maciej S. Szmigiero, 2023/11/06
- [PULL 08/10] qapi: Add HV_BALLOON_STATUS_REPORT event and its QMP query command, Maciej S. Szmigiero, 2023/11/06
- [PULL 09/10] hw/i386/pc: Support hv-balloon, Maciej S. Szmigiero, 2023/11/06