]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
virtio-mem: improve error message when unplug of device fails due to plugged memory
authorDavid Hildenbrand <david@redhat.com>
Tue, 16 Apr 2024 14:14:26 +0000 (16:14 +0200)
committerDavid Hildenbrand <david@redhat.com>
Wed, 10 Jul 2024 16:06:24 +0000 (18:06 +0200)
The error message is actually expressive, considering QEMU only. But
when called from Libvirt, talking about "size" can be confusing, because
in Libvirt "size" translates to the memory backend size in QEMU (maximum
size) and "current" translates to the QEMU "size" property.

Let's simply avoid talking about the "size" property and spell out that
some device memory is still plugged.

Message-ID: <20240416141426.588544-1-david@redhat.com>
Tested-by: Mario Casquero <mcasquer@redhat.com>
Cc: Liang Cong <lcong@redhat.com>
Cc: Mario Casquero <mcasquer@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
hw/virtio/virtio-mem.c

index ffd119ebacb766773322137a82bb64e1bb7e7b14..ef64bf1b4a1a5508e84baeef1a9f919787b2aecd 100644 (file)
@@ -1832,8 +1832,8 @@ static void virtio_mem_unplug_request_check(VirtIOMEM *vmem, Error **errp)
     }
 
     if (vmem->size) {
-        error_setg(errp, "virtio-mem device cannot get unplugged while"
-                   " '" VIRTIO_MEM_SIZE_PROP "' != '0'");
+        error_setg(errp, "virtio-mem device cannot get unplugged while some"
+                   " of its memory is still plugged");
         return;
     }
     if (vmem->requested_size) {