From 463b52f285164ec3dc0649763e06e40cea9e8a1f Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Thu, 12 Nov 2015 15:29:55 -0200 Subject: pc: Don't set hw_version on pc-*-2.5 Now that qemu_hw_version() returns a fixed "2.5+" string instead of QEMU_VERSION, we don't need to set hw_version on pc-*-2.5 explicitly. Suggested-by: Michael S. Tsirkin Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - 2 files changed, 2 deletions(-) (limited to 'hw') 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"; } -- cgit v1.1 From 449e3578107799817a81249b189f6f82aa9e787d Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Wed, 25 Nov 2015 13:39:57 +0200 Subject: Revert "vhost: send SET_VRING_ENABLE at start/stop" This reverts commit 3a12f32229a046f4d4ab0a3a52fb01d2d5a1ab76. In case of live migration several queues can be enabled and not only the first one. So informing backend that only the first queue is enabled is wrong. Reported-by: Thibaut Collet Cc: Yuanhan Liu Signed-off-by: Michael S. Tsirkin Reviewed-by: Yuanhan Liu --- hw/virtio/vhost.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'hw') 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; -- cgit v1.1 From 903a41d3415960240cb3b9f1d66f3707b27010d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefano=20Dong=20=28=E8=91=A3=E5=85=B4=E6=B0=B4=29?= Date: Thu, 26 Nov 2015 12:00:12 +0000 Subject: Fix memory leak on error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit hw/ppc/spapr.c: Fix memory leak on error, it was introduced in bc09e0611 hw/acpi/memory_hotplug.c: Fix memory leak on error, it was introduced in 34f2af3d Signed-off-by: Stefano Dong (董兴水) Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/acpi/memory_hotplug.c | 1 + hw/ppc/spapr.c | 1 + 2 files changed, 2 insertions(+) (limited to 'hw') 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/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) { -- cgit v1.1