From 252a2e968c0adf1c61c91e98fba4effe067d7959 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Fri, 27 Oct 2023 09:29:22 +0200
Subject: [PATCH] EditDiskModal: Properly initialize Cache selector

`cacheMode` is null if the domain XML does not specify a value, but the
`value` should always point to an actual valid option. Fall back to
"default".
---
 src/components/vm/disks/diskEdit.jsx | 2 +-
 test/machineslib.py                  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/vm/disks/diskEdit.jsx b/src/components/vm/disks/diskEdit.jsx
index 1466347c0..33adde676 100644
--- a/src/components/vm/disks/diskEdit.jsx
+++ b/src/components/vm/disks/diskEdit.jsx
@@ -67,7 +67,7 @@ const CacheRow = ({ onValueChanged, dialogValues, idPrefix, shutoff }) => {
             <FormSelect id={`${idPrefix}-cache-mode`}
                         onChange={(_event, value) => onValueChanged('cacheMode', value)}
                         isDisabled={!shutoff}
-                        value={dialogValues.cacheMode}>
+                        value={dialogValues.cacheMode ?? "default"}>
                 {diskCacheModes.map(cacheMode => {
                     return (
                         <FormSelectOption value={cacheMode} key={cacheMode}
diff --git a/test/machineslib.py b/test/machineslib.py
index 1f5b47566..1c4908cb3 100644
--- a/test/machineslib.py
+++ b/test/machineslib.py
@@ -433,7 +433,6 @@ def setUp(self):
             "Tried changing state of a disconnected RFB object",
             "Failed to get libvirt version from the dbus API:.*Cannot recv data: Connection reset by peer",
             # FIXME: React errors on /devel scenario; these are actual bugs!
-            "Warning: .* prop on .* should not be null.",
             "Warning: Received .* for a non-boolean attribute",
             'Warning: Each child in a list should have a unique "key" prop',
             "Warning: React does not recognize the .* prop on a DOM element",