summaryrefslogtreecommitdiff
path: root/util/qemu-openpty.c
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2015-07-09 10:17:15 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-07-09 13:51:27 +0100
commit5a2db89615c8efabbeca74fe5e0f14f312d3bbe3 (patch)
tree596488def39a6ea8ed0ff15417990a0296cae4f9 /util/qemu-openpty.c
parenta8f13961fdcff3a5969b9884368e875aa068f1c9 (diff)
downloadqemu-5a2db89615c8efabbeca74fe5e0f14f312d3bbe3.tar.gz
mips/kvm: Sync with newer MIPS KVM headers
The KVM_REG_MIPS_COUNT_* definitions are now included in linux-headers/asm-mips/kvm.h since commit b061808d39fa ("linux-headers: update linux headers to kvm/next"), therefore the duplicate definitions in target-mips/kvm.c can now be dropped (the definitions were tweaked slightly in commit 7a52ce8a1607 ("linux-headers: update") which triggered the following build warnings turned errors): target-mips/kvm.c:232:0: error: "KVM_REG_MIPS_COUNT_CTL" redefined [-Werror] linux-headers/asm/kvm.h:129:0: note: this is the location of the previous definition target-mips/kvm.c:236:0: error: "KVM_REG_MIPS_COUNT_RESUME" redefined [-Werror] linux-headers/asm/kvm.h:141:0: note: this is the location of the previous definition target-mips/kvm.c:239:0: error: "KVM_REG_MIPS_COUNT_HZ" redefined [-Werror] linux-headers/asm/kvm.h:147:0: note: this is the location of the previous definition Also update the MIPS_C0_{32,64} macros to utilise definitions more recently added to the asm-mips/kvm.h header. Signed-off-by: James Hogan <james.hogan@imgtec.com> Reviewed-by: Leon Alrae <leon.alrae@imgtec.com> Message-id: 1436433435-24898-3-git-send-email-james.hogan@imgtec.com Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Leon Alrae <leon.alrae@imgtec.com> Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: kvm@vger.kernel.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-openpty.c')
0 files changed, 0 insertions, 0 deletions