53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From 85da3db92e4b25275426e252974db7eae18e2bb1 Mon Sep 17 00:00:00 2001
|
||
From: Mark McLoughlin <markmc@redhat.com>
|
||
Date: Mon, 29 Jun 2009 16:09:45 +0100
|
||
Subject: [PATCH] Fix pcspk build with kvm disabled
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=utf-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Errors are:
|
||
|
||
hw/pcspk.c:85: error: expected declaration specifiers or ‘...’ before ‘kvm_pit_state’
|
||
hw/pcspk.c:87: error: expected declaration specifiers or ‘...’ before ‘kvm_pit_state’
|
||
hw/pcspk.c: In function ‘pcspk_callback’:
|
||
hw/pcspk.c:114: error: too many arguments to function ‘kvm_get_pit_ch2’
|
||
hw/pcspk.c: In function ‘pcspk_ioport_read’:
|
||
hw/pcspk.c:161: error: too many arguments to function ‘kvm_get_pit_ch2’
|
||
hw/pcspk.c: In function ‘pcspk_ioport_write’:
|
||
hw/pcspk.c:171: error: storage size of ‘inkernel_state’ isn’t known
|
||
hw/pcspk.c:175: error: too many arguments to function ‘kvm_get_pit_ch2’
|
||
hw/pcspk.c:185: error: too many arguments to function ‘kvm_set_pit_ch2’
|
||
hw/pcspk.c:171: warning: unused variable ‘inkernel_state’
|
||
|
||
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
|
||
Cc: Jan Kiszka <jan.kiszka@web.de>
|
||
---
|
||
hw/pcspk.c | 6 +++++-
|
||
1 files changed, 5 insertions(+), 1 deletions(-)
|
||
|
||
diff --git a/hw/pcspk.c b/hw/pcspk.c
|
||
index 9e1b59a..fb823d5 100644
|
||
--- a/hw/pcspk.c
|
||
+++ b/hw/pcspk.c
|
||
@@ -80,11 +80,15 @@ static void kvm_set_pit_ch2(PITState *pit,
|
||
kvm_set_pit(kvm_context, inkernel_state);
|
||
}
|
||
}
|
||
-#else
|
||
+#elif defined(USE_KVM)
|
||
static inline void kvm_get_pit_ch2(PITState *pit,
|
||
kvm_pit_state *inkernel_state) { }
|
||
static inline void kvm_set_pit_ch2(PITState *pit,
|
||
kvm_pit_state *inkernel_state) { }
|
||
+#else
|
||
+typedef struct kvm_pit_state { char dummy; } kvm_pit_state;
|
||
+#define kvm_get_pit_ch2(p, s) do { (void)s; } while(0)
|
||
+#define kvm_set_pit_ch2(p, s) do { (void)s; } while(0)
|
||
#endif
|
||
|
||
static inline void generate_samples(PCSpkState *s)
|
||
--
|
||
1.6.2.5
|
||
|