From: Peter Maydell Date: Fri, 6 Nov 2020 09:40:50 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20201106' into staging X-Git-Tag: v5.2.0-rc1~11 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a47c284a7cf8f6e98df974b1009bf412653ce01e;p=users%2Fdwmw2%2Fqemu.git Merge remote-tracking branch 'remotes/cschoenebeck/tags/pull-9p-20201106' into staging 9pfs: some fixes * Fix meson build config for Xen. * Code style fixes. # gpg: Signature made Fri 06 Nov 2020 09:12:51 GMT # gpg: using RSA key 96D8D110CF7AF8084F88590134C2B58765A47395 # gpg: issuer "qemu_oss@crudebyte.com" # gpg: Good signature from "Christian Schoenebeck " [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: ECAB 1A45 4014 1413 BA38 4926 30DB 47C3 A012 D5F4 # Subkey fingerprint: 96D8 D110 CF7A F808 4F88 5901 34C2 B587 65A4 7395 * remotes/cschoenebeck/tags/pull-9p-20201106: hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen hw/9pfs : add space before the open parenthesis '(' hw/9pfs : open brace '{' following struct go on the same line hw/9pfs : add spaces around operator Signed-off-by: Peter Maydell --- a47c284a7cf8f6e98df974b1009bf412653ce01e