Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > aadbe78a25743146bb784eee19f007c5 > files > 483

kvm-83-164.el5_5.9.src.rpm

From 408558fba6b011df89fc4a6b93f7a679a78350c7 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 17 Sep 2009 14:06:02 -0300
Subject: [PATCH 05/38] kvm pit is used in two cases, not easy way to define it in vl.c

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <ca27fa41d4af6982e83c8b06face7667e6b2c88b.1249487147.git.quintela@redhat.com>
Patchwork-id: 3173
O-Subject: [PATCH 08/38] kvm pit is used in two cases,
	not easy way to define it in vl.c
Bugzilla: 515749
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/qemu-kvm.h |    1 +
 qemu/vl.c       |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/qemu-kvm.h |    1 +
 qemu/vl.c       |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu/qemu-kvm.h b/qemu/qemu-kvm.h
index 6f9a8e5..c65030e 100644
--- a/qemu/qemu-kvm.h
+++ b/qemu/qemu-kvm.h
@@ -149,6 +149,7 @@ int handle_powerpc_dcr_write(int vcpu,uint32_t dcrn, uint32_t data);
 #include "libkvm.h"
 #include "sys-queue.h"
 
+extern int kvm_pit;
 extern int kvm_allowed;
 extern int kvm_nested;
 extern kvm_context_t kvm_context;
diff --git a/qemu/vl.c b/qemu/vl.c
index bbc63a7..fad5491 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -5651,13 +5651,12 @@ int main(int argc, char **argv, char **envp)
 		kvm_allowed = 0;
 		break;
 	    case QEMU_OPTION_no_kvm_irqchip: {
-		extern int kvm_irqchip, kvm_pit;
+		extern int kvm_irqchip;
 		kvm_irqchip = 0;
 		kvm_pit = 0;
 		break;
 	    }
 	    case QEMU_OPTION_no_kvm_pit: {
-		extern int kvm_pit;
 		kvm_pit = 0;
 		break;
 	    }
-- 
1.6.3.rc4.29.g8146