From: Mark McLoughlin <markmc@redhat.com>
To: Avi Kivity <avi@redhat.com>
Cc: Jan Kiszka <jan.kiszka@web.de>, kvm <kvm@vger.kernel.org>
Subject: [PATCH] Fix pcspk build with kvm disabled
Date: Mon, 29 Jun 2009 16:19:22 +0100 [thread overview]
Message-ID: <1246288762.11688.39.camel@blaa> (raw)
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
next reply other threads:[~2009-06-29 15:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-29 15:19 Mark McLoughlin [this message]
2009-06-29 16:00 ` [PATCH] Fix pcspk build with kvm disabled Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1246288762.11688.39.camel@blaa \
--to=markmc@redhat.com \
--cc=avi@redhat.com \
--cc=jan.kiszka@web.de \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.