[PATCH] kvm/x86 : Replace BUG_ON(1) with BUG()

[richard.p...@oppo.com]

Signed-off-by: Peng Hao 
---
 arch/x86/kvm/vmx/nested.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index e76eb4f..d0e6c40 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -4945,8 +4945,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)
 */
    break;
    default:
-   BUG_ON(1);
-   break;
+   BUG();
    }
 
    return nested_vmx_succeed(vcpu);
-- 
2.7.4

[PATCH] vhost/vsock: Micro optimize error handle

[richard.p...@oppo.com]

When a vq error, there is no need to operate on the unmodified vq.

Signed-off-by:Peng Hao 
---
 drivers/vhost/vsock.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 6a50e1d..0bed19d 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -437,7 +437,7 @@ static void vhost_vsock_handle_rx_kick(struct vhost_work 
*work)
 static int vhost_vsock_start(struct vhost_vsock *vsock)
 {
    struct vhost_virtqueue *vq;
-   size_t i;
+   size_t i, j;
    int ret;
 
    mutex_lock(&vsock->dev.mutex);
@@ -473,8 +473,8 @@ static int vhost_vsock_start(struct vhost_vsock *vsock)
    vq->private_data = NULL;
    mutex_unlock(&vq->mutex);
 
-   for (i = 0; i < ARRAY_SIZE(vsock->vqs); i++) {
-   vq = &vsock->vqs[i];
+   for (j = 0; j < i; j++) {
+   vq = &vsock->vqs[j];
 
    mutex_lock(&vq->mutex);
    vq->private_data = NULL;
-- 
2.7.4