mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 15:23:53 -06:00
* Linux header update and cleanup
* Support for HyperV crash report * Cleanup of target-specific HMP commands * Multiarch batch * Checkpatch fix for Perl 5.22 * NBD fix * Revert incorrect commit5243722376-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJV+Y0VAAoJEL/70l94x66DppAH/393irRPGYJiZqClXDmPZymd Ilv+mKQIA+QSGiMaVoq0POWqvSa6oPOIOAK8BexhHDWPnxDSeAU9JzjrkwQILjD3 A5kFsR1mhw/oV8aZCsE926SUoY90VH7QP2r0iGdur1VV9DG7CUE8q95umJuU1FCo hvGI2HjlAPvxSrO+Y5vu4ZNOa5XBiUoLodT0j+jNZfoNMx3irAqkJLPqTUuPT8np jBeu1MtMe3wNjDBm3WMVZwkNEZ3YtuhRkBeggXqDIl1Jm9lq4Eitk7rtETXm6yHz Vjp9uAF4en/72gXbELRXp+aWvESEABcouLZrdPV/yjOmQD2oTFC7sZrm1c5rZPw= =MkK8 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging * Linux header update and cleanup * Support for HyperV crash report * Cleanup of target-specific HMP commands * Multiarch batch * Checkpatch fix for Perl 5.22 * NBD fix * Revert incorrect commit5243722376# gpg: Signature made Wed 16 Sep 2015 16:39:01 BST using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" * remotes/bonzini/tags/for-upstream: (24 commits) nbd: release exp->blk after all clients are closed checkpatch: Escape left braces in regex monitor: uninclude cpu_ldst include/exec: Move cputlb exec.c defs out cputlb: Change tlb_set_dirty() arg to cpu cputlb: move CPU_LOOP() for tlb_reset() to exec.c translate: move real_host_page setting to -common tcg: Move tci_tb_ptr to -common tcg: split tcg_op_defs to -common translate-all: Move tcg_handle_interrupt() to -common cpu-exec: Migrate some generic fns to cpu-exec-common qemu-char: Use g_new() & friends where that makes obvious sense monitor: added generation of documentation for hmp-commands-info.hx hmp-commands.hx: fix end of table info monitor: remove target-specific code from monitor.c hmp-commands-info: move info_cmds content out of monitor.c i386/kvm: Hyper-v crash msrs set/get'ers and migration kvm: Add kvm system event crash handler cpu: Add crash_occurred flag into CPUState target-i386: move asm-x86/hyperv.h to standard-headers ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
1c9f03b81c
55 changed files with 2764 additions and 1933 deletions
|
|
@ -582,7 +582,7 @@ sub statement_block_size {
|
|||
my ($stmt) = @_;
|
||||
|
||||
$stmt =~ s/(^|\n)./$1/g;
|
||||
$stmt =~ s/^\s*{//;
|
||||
$stmt =~ s/^\s*\{//;
|
||||
$stmt =~ s/}\s*$//;
|
||||
$stmt =~ s/^\s*//;
|
||||
$stmt =~ s/\s*$//;
|
||||
|
|
@ -1479,7 +1479,7 @@ sub process {
|
|||
# 79 or 80 characters, it is no longer possible to add a space and an
|
||||
# opening brace there)
|
||||
if ($#ctx == 0 && $ctx !~ /{\s*/ &&
|
||||
defined($lines[$ctx_ln - 1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/ &&
|
||||
defined($lines[$ctx_ln - 1]) && $lines[$ctx_ln - 1] =~ /^\+\s*\{/ &&
|
||||
defined($lines[$ctx_ln - 2]) && length($lines[$ctx_ln - 2]) < 80) {
|
||||
ERROR("that open brace { should be on the previous line\n" .
|
||||
"$here\n$ctx\n$rawlines[$ctx_ln - 1]\n");
|
||||
|
|
@ -1519,7 +1519,7 @@ sub process {
|
|||
my $continuation = 0;
|
||||
my $check = 0;
|
||||
$s =~ s/^.*\bdo\b//;
|
||||
$s =~ s/^\s*{//;
|
||||
$s =~ s/^\s*\{//;
|
||||
if ($s =~ s/^\s*\\//) {
|
||||
$continuation = 1;
|
||||
}
|
||||
|
|
@ -1618,7 +1618,7 @@ sub process {
|
|||
}
|
||||
|
||||
# check for initialisation to aggregates open brace on the next line
|
||||
if ($line =~ /^.\s*{/ &&
|
||||
if ($line =~ /^.\s*\{/ &&
|
||||
$prevline =~ /(?:^|[^=])=\s*$/) {
|
||||
ERROR("that open brace { should be on the previous line\n" . $hereprev);
|
||||
}
|
||||
|
|
@ -1693,13 +1693,13 @@ sub process {
|
|||
|
||||
# function brace can't be on same line, except for #defines of do while,
|
||||
# or if closed on same line
|
||||
if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
|
||||
!($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) {
|
||||
if (($line=~/$Type\s*$Ident\(.*\).*\s\{/) and
|
||||
!($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
|
||||
ERROR("open brace '{' following function declarations go on the next line\n" . $herecurr);
|
||||
}
|
||||
|
||||
# open braces for enum, union and struct go on the same line.
|
||||
if ($line =~ /^.\s*{/ &&
|
||||
if ($line =~ /^.\s*\{/ &&
|
||||
$prevline =~ /^.\s*(?:typedef\s+)?(enum|union|struct)(?:\s+$Ident)?\s*$/) {
|
||||
ERROR("open brace '{' following $1 go on the same line\n" . $hereprev);
|
||||
}
|
||||
|
|
@ -1853,7 +1853,7 @@ sub process {
|
|||
# not required when having a single },{ on one line
|
||||
} elsif ($op eq ',') {
|
||||
if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/ &&
|
||||
($elements[$n] . $elements[$n + 2]) !~ " *}{") {
|
||||
($elements[$n] . $elements[$n + 2]) !~ " *}\\{") {
|
||||
ERROR("space required after that '$op' $at\n" . $hereptr);
|
||||
}
|
||||
|
||||
|
|
@ -1953,8 +1953,8 @@ sub process {
|
|||
}
|
||||
|
||||
#need space before brace following if, while, etc
|
||||
if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
|
||||
$line =~ /do{/) {
|
||||
if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
|
||||
$line =~ /do\{/) {
|
||||
ERROR("space required before the open brace '{'\n" . $herecurr);
|
||||
}
|
||||
|
||||
|
|
@ -2268,7 +2268,7 @@ sub process {
|
|||
my $spaced_block = $block;
|
||||
$spaced_block =~ s/\n\+/ /g;
|
||||
|
||||
$seen++ if ($spaced_block =~ /^\s*{/);
|
||||
$seen++ if ($spaced_block =~ /^\s*\{/);
|
||||
|
||||
print "APW: cond<$cond> block<$block> allowed<$allowed>\n"
|
||||
if $dbg_adv_apw;
|
||||
|
|
|
|||
|
|
@ -28,38 +28,32 @@ if [ -z "$output" ]; then
|
|||
output="$PWD"
|
||||
fi
|
||||
|
||||
cp_virtio() {
|
||||
from=$1
|
||||
cp_portable() {
|
||||
f=$1
|
||||
to=$2
|
||||
virtio=$(find "$from" -name '*virtio*h' -o -name "input.h" -o -name "pci_regs.h")
|
||||
if [ "$virtio" ]; then
|
||||
rm -rf "$to"
|
||||
mkdir -p "$to"
|
||||
for f in $virtio; do
|
||||
if
|
||||
grep '#include' "$f" | grep -v -e 'linux/virtio' \
|
||||
-e 'linux/types' \
|
||||
-e 'linux/if_ether' \
|
||||
-e 'sys/' \
|
||||
> /dev/null
|
||||
then
|
||||
echo "Unexpected #include in input file $f".
|
||||
exit 2
|
||||
fi
|
||||
|
||||
header=$(basename "$f");
|
||||
sed -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \
|
||||
-e 's/__s\([0-9][0-9]*\)/int\1_t/g' \
|
||||
-e 's/__le\([0-9][0-9]*\)/uint\1_t/g' \
|
||||
-e 's/__be\([0-9][0-9]*\)/uint\1_t/g' \
|
||||
-e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
|
||||
-e 's/__bitwise__//' \
|
||||
-e 's/__attribute__((packed))/QEMU_PACKED/' \
|
||||
-e 's/__inline__/inline/' \
|
||||
-e '/sys\/ioctl.h/d' \
|
||||
"$f" > "$to/$header";
|
||||
done
|
||||
if
|
||||
grep '#include' "$f" | grep -v -e 'linux/virtio' \
|
||||
-e 'linux/types' \
|
||||
-e 'stdint' \
|
||||
-e 'linux/if_ether' \
|
||||
-e 'sys/' \
|
||||
> /dev/null
|
||||
then
|
||||
echo "Unexpected #include in input file $f".
|
||||
exit 2
|
||||
fi
|
||||
|
||||
header=$(basename "$f");
|
||||
sed -e 's/__u\([0-9][0-9]*\)/uint\1_t/g' \
|
||||
-e 's/__s\([0-9][0-9]*\)/int\1_t/g' \
|
||||
-e 's/__le\([0-9][0-9]*\)/uint\1_t/g' \
|
||||
-e 's/__be\([0-9][0-9]*\)/uint\1_t/g' \
|
||||
-e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
|
||||
-e 's/__bitwise__//' \
|
||||
-e 's/__attribute__((packed))/QEMU_PACKED/' \
|
||||
-e 's/__inline__/inline/' \
|
||||
-e '/sys\/ioctl.h/d' \
|
||||
"$f" > "$to/$header";
|
||||
}
|
||||
|
||||
# This will pick up non-directories too (eg "Kconfig") but we will
|
||||
|
|
@ -85,14 +79,19 @@ for arch in $ARCHLIST; do
|
|||
for header in kvm.h kvm_para.h; do
|
||||
cp "$tmpdir/include/asm/$header" "$output/linux-headers/asm-$arch"
|
||||
done
|
||||
if [ $arch = x86 ]; then
|
||||
cp "$tmpdir/include/asm/hyperv.h" "$output/linux-headers/asm-x86"
|
||||
fi
|
||||
if [ $arch = powerpc ]; then
|
||||
cp "$tmpdir/include/asm/epapr_hcalls.h" "$output/linux-headers/asm-powerpc/"
|
||||
fi
|
||||
|
||||
cp_virtio "$tmpdir/include/asm" "$output/include/standard-headers/asm-$arch"
|
||||
rm -rf "$output/include/standard-headers/asm-$arch"
|
||||
mkdir -p "$output/include/standard-headers/asm-$arch"
|
||||
if [ $arch = s390 ]; then
|
||||
cp_portable "$tmpdir/include/asm/kvm_virtio.h" "$output/include/standard-headers/asm-s390/"
|
||||
cp_portable "$tmpdir/include/asm/virtio-ccw.h" "$output/include/standard-headers/asm-s390/"
|
||||
fi
|
||||
if [ $arch = x86 ]; then
|
||||
cp_portable "$tmpdir/include/asm/hyperv.h" "$output/include/standard-headers/asm-x86/"
|
||||
fi
|
||||
done
|
||||
|
||||
rm -rf "$output/linux-headers/linux"
|
||||
|
|
@ -112,6 +111,9 @@ else
|
|||
cp "$linux/COPYING" "$output/linux-headers"
|
||||
fi
|
||||
|
||||
cat <<EOF >$output/linux-headers/asm-x86/hyperv.h
|
||||
#include "standard-headers/asm-x86/hyperv.h"
|
||||
EOF
|
||||
cat <<EOF >$output/linux-headers/linux/virtio_config.h
|
||||
#include "standard-headers/linux/virtio_config.h"
|
||||
EOF
|
||||
|
|
@ -119,7 +121,12 @@ cat <<EOF >$output/linux-headers/linux/virtio_ring.h
|
|||
#include "standard-headers/linux/virtio_ring.h"
|
||||
EOF
|
||||
|
||||
cp_virtio "$tmpdir/include/linux/" "$output/include/standard-headers/linux"
|
||||
rm -rf "$output/include/standard-headers/linux"
|
||||
mkdir -p "$output/include/standard-headers/linux"
|
||||
for i in "$tmpdir"/include/linux/*virtio*.h "$tmpdir/include/linux/input.h" \
|
||||
"$tmpdir/include/linux/pci_regs.h"; do
|
||||
cp_portable "$i" "$output/include/standard-headers/linux"
|
||||
done
|
||||
|
||||
cat <<EOF >$output/include/standard-headers/linux/types.h
|
||||
#include <stdint.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue