diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-12 10:47:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-12 10:47:07 +0000 |
| commit | 613c12ec28573b10cae0cd91139ba69b964f347c (patch) | |
| tree | b66907dde9f7aa0bf57503fea2be092b43d26e56 /target-i386 | |
| parent | be813ef02d18ba58e1ff32f1706bcacb88f1f764 (diff) | |
| parent | 2a7a1a56d1e30de07cf7d7636a35bf7706b9500e (diff) | |
| download | qemu-613c12ec28573b10cae0cd91139ba69b964f347c.tar.gz qemu-613c12ec28573b10cae0cd91139ba69b964f347c.tar.bz2 qemu-613c12ec28573b10cae0cd91139ba69b964f347c.zip | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
tests: test-qmp-commands: Fix double free
qapi script: do not add "_" for every capitalized char in enum
qapi script: do not allow string discriminator
qapi: convert BlockdevOptions to use enum discriminator
qapi script: support enum type as discriminator in union
qapi script: use same function to generate enum string
qapi script: code move for generate_enum_name()
qapi script: check correctness of union
qapi script: remember line number in schema parsing
qapi script: add check for duplicated key
qapi script: remember explicitly defined enum values
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 9f69d7e192..5cfe4506e0 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -315,7 +315,7 @@ typedef struct X86RegisterInfo32 { } X86RegisterInfo32; #define REGISTER(reg) \ - [R_##reg] = { .name = #reg, .qapi_enum = X86_C_P_U_REGISTER32_##reg } + [R_##reg] = { .name = #reg, .qapi_enum = X86_CPU_REGISTER32_##reg } X86RegisterInfo32 x86_reg_info_32[CPU_NB_REGS32] = { REGISTER(EAX), REGISTER(ECX), |