diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2017-03-20 18:05:57 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2017-03-22 18:29:27 +0200 |
| commit | f92063028a0ea9e15d8f962644bce76c0e8aa7d1 (patch) | |
| tree | aa6351da0d31306379373403493ee34065c05391 | |
| parent | f2a1ae45d8ec5ad494e66a9234499a2e0fbf4b40 (diff) | |
| download | qemu-f92063028a0ea9e15d8f962644bce76c0e8aa7d1.zip qemu-f92063028a0ea9e15d8f962644bce76c0e8aa7d1.tar.gz qemu-f92063028a0ea9e15d8f962644bce76c0e8aa7d1.tar.bz2 | |
hw/acpi/vmgenid: prevent more than one vmgenid device
A system with multiple VMGENID devices is undefined in the VMGENID spec by
omission.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ben Warren <ben@skyportsystems.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
| -rw-r--r-- | hw/acpi/vmgenid.c | 8 | ||||
| -rw-r--r-- | include/hw/acpi/vmgenid.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index c3ddcc8..a32b847 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -221,6 +221,14 @@ static void vmgenid_realize(DeviceState *dev, Error **errp) return; } + /* Given that this function is executing, there is at least one VMGENID + * device. Check if there are several. + */ + if (!find_vmgenid_dev()) { + error_setg(errp, "at most one %s device is permitted", VMGENID_DEVICE); + return; + } + qemu_register_reset(vmgenid_handle_reset, vms); } diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h index 8578476..7beb959 100644 --- a/include/hw/acpi/vmgenid.h +++ b/include/hw/acpi/vmgenid.h @@ -24,6 +24,7 @@ typedef struct VmGenIdState { bool write_pointer_available; } VmGenIdState; +/* returns NULL unless there is exactly one device */ static inline Object *find_vmgenid_dev(void) { return object_resolve_path_type("", VMGENID_DEVICE, NULL); |