[PATCH]: Fixes the qemu-kvm compilation failure when configured with disable-kvm

[Prasad Joshi <prasadjoshi124@xxxxxxxxx>]

I pulled the latest qemu-kvm code and configured it with disabled-kvm
and related options. Configuration finishes well, but the compilation
fails.

prasad@prasad-kvm:~/KVM/qemu-kvm$ ./configure --disable-kvm
--disable-kvm-device-assignment --disable-kvm-pit
...
...

prasad@prasad-kvm:~/KVM/qemu-kvm$ make
....
....
  CC    x86_64-softmmu/kvm-stub.o
/home/prasad/KVM/qemu-kvm/kvm-stub.c:140: error: expected identifier
or ‘(’ before ‘<<’ token
make[1]: *** [kvm-stub.o] Error 1
make: *** [subdir-x86_64-softmmu] Error 2


A Small fix would be

Signed-off-by: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
---
diff --git a/kvm-stub.c b/kvm-stub.c
index caef9b4..fc2b810 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -137,7 +137,6 @@ int kvm_set_ioeventfd_mmio_long(int fd, uint32_t
adr, uint32_t val, bool assign)
     return -ENOSYS;
 }

-<<<<<<< HEAD
 int kvm_has_gsi_routing(void)
 {
     return 0;
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html