On Mon, 2023-01-30 at 09:41 +0100, Thomas Huth wrote:
> 
> The files in include/standard-headers are created automatically by the 
> scripts/update-linux-headers.sh script, so I was a little bit surprised that 
> you don't provide an update to that script first ... if you copy new headers 
> there manually, that might  cause troubles later for the next person who 
> runs the update-linux-headers.sh script. So I suggest to either adapt the 
> script for your needs, or put the xen headers in a different location.

Thanks; I hadn't clocked that include/standard-headers was in fact just
*Linux* headers.

I'd previously added the new headers here, done a bunch of header
untangling and moving code to use them, and then removed the old ones.

It turns out that through some combination of the header cleanups which
have already happened in the master branch, various cleanup iterations
of this series, and a few more tweaks within the series, I can drop the
updated headers directly over the top of the old ones in
include/hw/xen/interface.

Updated in 
https://git.infradead.org/users/dwmw2/qemu.git/shortlog/refs/heads/xenfv