summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-07-29 12:11:54 (GMT)
committerAvi Kivity <avi@redhat.com>2010-10-24 08:50:25 (GMT)
commitd0e533255d3811382c97b594ff7ab19b9b036814 (patch)
tree1473d26d965f25d3548e3424748d969de69d5c73
parent73fba5f4fe3e08bd7acb18a65b53643445c8f028 (diff)
downloadlinux-fsl-qoriq-d0e533255d3811382c97b594ff7ab19b9b036814.tar.xz
KVM: x86 emulator: allow repeat macro arguments to contain commas
Needed for repeating instructions with execution functions. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/kvm/emulate.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 70a7cb4..7e9bcda 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -94,14 +94,14 @@
#define Src2One (3<<29)
#define Src2Mask (7<<29)
-#define X2(x) x, x
-#define X3(x) X2(x), x
-#define X4(x) X2(x), X2(x)
-#define X5(x) X4(x), x
-#define X6(x) X4(x), X2(x)
-#define X7(x) X4(x), X3(x)
-#define X8(x) X4(x), X4(x)
-#define X16(x) X8(x), X8(x)
+#define X2(x...) x, x
+#define X3(x...) X2(x), x
+#define X4(x...) X2(x), X2(x)
+#define X5(x...) X4(x), x
+#define X6(x...) X4(x), X2(x)
+#define X7(x...) X4(x), X3(x)
+#define X8(x...) X4(x), X4(x)
+#define X16(x...) X8(x), X8(x)
struct opcode {
u32 flags;