diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/acpi/memory_hotplug.c | 1 | ||||
| -rw-r--r-- | hw/i386/pc_piix.c | 1 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 1 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 1 | ||||
| -rw-r--r-- | hw/virtio/vhost.c | 9 |
5 files changed, 2 insertions, 11 deletions
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index ce428df..e4b9a01 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -155,6 +155,7 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data, qapi_event_send_mem_unplug_error(dev->id, error_get_pretty(local_err), &error_abort); + error_free(local_err); break; } trace_mhp_acpi_pc_dimm_deleted(mem_st->selector); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 07d0baa..2e41efe 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -472,7 +472,6 @@ static void pc_i440fx_machine_options(MachineClass *m) static void pc_i440fx_2_5_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); - m->hw_version = QEMU_VERSION; m->alias = "pc"; m->is_default = 1; } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 0fdae09..133bc68 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -373,7 +373,6 @@ static void pc_q35_machine_options(MachineClass *m) static void pc_q35_2_5_machine_options(MachineClass *m) { pc_q35_machine_options(m); - m->hw_version = QEMU_VERSION; m->alias = "q35"; } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 030ee35..3bb8bcd 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -125,6 +125,7 @@ static XICSState *xics_system_init(MachineState *machine, error_report("kernel_irqchip requested but unavailable: %s", error_get_pretty(err)); } + error_free(err); } if (!icp) { diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 1794f0d..de29968 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1226,11 +1226,6 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) } } - if (hdev->vhost_ops->vhost_set_vring_enable) { - /* only enable first vq pair by default */ - hdev->vhost_ops->vhost_set_vring_enable(hdev, hdev->vq_index == 0); - } - return 0; fail_log: vhost_log_put(hdev, false); @@ -1261,10 +1256,6 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev) hdev->vq_index + i); } - if (hdev->vhost_ops->vhost_set_vring_enable) { - hdev->vhost_ops->vhost_set_vring_enable(hdev, 0); - } - vhost_log_put(hdev, true); hdev->started = false; hdev->log = NULL; |