diff options
| author | Markus Armbruster | 2020-04-22 15:07:10 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2020-04-29 08:01:52 +0200 |
| commit | 0fbddcecf23dcc311b42d9faf87dc2656dadd62a (patch) | |
| tree | 147e83f6c6a681b5bffb3fb92ed26cdb771d60d2 | |
| parent | cpus: Proper range-checking for -icount shift=N (diff) | |
| download | qemu-0fbddcecf23dcc311b42d9faf87dc2656dadd62a.tar.gz qemu-0fbddcecf23dcc311b42d9faf87dc2656dadd62a.tar.xz qemu-0fbddcecf23dcc311b42d9faf87dc2656dadd62a.zip | |
arm/virt: Fix virt_machine_device_plug_cb() error API violation
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
virt_machine_device_plug_cb() passes @errp to
cryptodev_builtin_sym_close_session() in a loop. Harmless, because
cryptodev_builtin_sym_close_session() can't actually fail. Fix by
dropping its Error ** parameter.
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200422130719.28225-6-armbru@redhat.com>
| -rw-r--r-- | hw/arm/virt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7dc96abf72..cca5316256 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1186,7 +1186,7 @@ static void create_smmu(const VirtMachineState *vms, g_free(node); } -static void create_virtio_iommu_dt_bindings(VirtMachineState *vms, Error **errp) +static void create_virtio_iommu_dt_bindings(VirtMachineState *vms) { const char compat[] = "virtio,pci-iommu"; uint16_t bdf = vms->virtio_iommu_bdf; @@ -2118,7 +2118,7 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, vms->iommu = VIRT_IOMMU_VIRTIO; vms->virtio_iommu_bdf = pci_get_bdf(pdev); - create_virtio_iommu_dt_bindings(vms, errp); + create_virtio_iommu_dt_bindings(vms); } } |