|
 |
902636 |
From 624d96c456536e1471968a59fbeea206309cc33b Mon Sep 17 00:00:00 2001
|
|
|
902636 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
902636 |
Date: Fri, 24 Jan 2020 19:46:13 +0100
|
|
|
902636 |
Subject: [PATCH 004/116] vhost: coding style fix
|
|
|
902636 |
MIME-Version: 1.0
|
|
|
902636 |
Content-Type: text/plain; charset=UTF-8
|
|
|
902636 |
Content-Transfer-Encoding: 8bit
|
|
|
902636 |
|
|
|
902636 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
902636 |
Message-id: <20200124194613.41119-4-dgilbert@redhat.com>
|
|
|
902636 |
Patchwork-id: 93453
|
|
|
902636 |
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 3/3] vhost: coding style fix
|
|
|
902636 |
Bugzilla: 1779041
|
|
|
902636 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
902636 |
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
902636 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
902636 |
|
|
|
902636 |
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
|
902636 |
|
|
|
902636 |
Drop a trailing whitespace. Make line shorter.
|
|
|
902636 |
|
|
|
902636 |
Fixes: 76525114736e8 ("vhost: Only align sections for vhost-user")
|
|
|
902636 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
902636 |
(cherry picked from commit 8347505640238d3b80f9bb7510fdc1bb574bad19)
|
|
|
902636 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
902636 |
---
|
|
|
902636 |
hw/virtio/vhost.c | 6 +++---
|
|
|
902636 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
902636 |
|
|
|
902636 |
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
|
|
|
902636 |
index 25fd469..9edfadc 100644
|
|
|
902636 |
--- a/hw/virtio/vhost.c
|
|
|
902636 |
+++ b/hw/virtio/vhost.c
|
|
|
902636 |
@@ -551,7 +551,7 @@ static void vhost_region_add_section(struct vhost_dev *dev,
|
|
|
902636 |
trace_vhost_region_add_section(section->mr->name, mrs_gpa, mrs_size,
|
|
|
902636 |
mrs_host);
|
|
|
902636 |
|
|
|
902636 |
- if (dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER) {
|
|
|
902636 |
+ if (dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER) {
|
|
|
902636 |
/* Round the section to it's page size */
|
|
|
902636 |
/* First align the start down to a page boundary */
|
|
|
902636 |
size_t mrs_page = qemu_ram_pagesize(mrs_rb);
|
|
|
902636 |
@@ -566,8 +566,8 @@ static void vhost_region_add_section(struct vhost_dev *dev,
|
|
|
902636 |
if (alignage) {
|
|
|
902636 |
mrs_size += mrs_page - alignage;
|
|
|
902636 |
}
|
|
|
902636 |
- trace_vhost_region_add_section_aligned(section->mr->name, mrs_gpa, mrs_size,
|
|
|
902636 |
- mrs_host);
|
|
|
902636 |
+ trace_vhost_region_add_section_aligned(section->mr->name, mrs_gpa,
|
|
|
902636 |
+ mrs_size, mrs_host);
|
|
|
902636 |
}
|
|
|
902636 |
|
|
|
902636 |
if (dev->n_tmp_sections) {
|
|
|
902636 |
--
|
|
|
902636 |
1.8.3.1
|
|
|
902636 |
|