On 10/5/21 2:32 PM, Michael S. Tsirkin wrote:
On Tue, Oct 05, 2021 at 10:21:43AM -0700, Richard Henderson wrote:
On 10/5/21 9:00 AM, Michael S. Tsirkin wrote:
The following changes since commit 9618c5badaa8eed25259cf095ff880efb939fbe7:
Merge remote-tracking branch
'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging
(2021-10-04 16:27:35 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
for you to fetch changes up to c7d2f59cf940b8c8c52c29d5fa25613fe662f7b6:
hw/i386/amd_iommu: Add description/category to TYPE_AMD_IOMMU_PCI
(2021-10-05 11:46:45 -0400)
----------------------------------------------------------------
...
You missed updating the stub version of these functions:
../src/hw/net/vhost_net-stub.c:34:5: error: conflicting types for
‘vhost_net_start’
34 | int vhost_net_start(VirtIODevice *dev,
| ^~~~~~~~~~~~~~~
In file included from ../src/hw/net/vhost_net-stub.c:19:
/home/rth/qemu-publish/src/include/net/vhost_net.h:24:5: note: previous
declaration of ‘vhost_net_start’ was here
24 | int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
| ^~~~~~~~~~~~~~~
../src/hw/net/vhost_net-stub.c:40:6: error: conflicting types for
‘vhost_net_stop’
40 | void vhost_net_stop(VirtIODevice *dev,
| ^~~~~~~~~~~~~~
In file included from ../src/hw/net/vhost_net-stub.c:19:
/home/rth/qemu-publish/src/include/net/vhost_net.h:26:6: note: previous
declaration of ‘vhost_net_stop’ was here
26 | void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
| ^~~~~~~~~~~~~~
Indeed. I dropped these patches for now.
Could you refetch from same tag and confirm it's ok?
Yes, that works. Applied, thanks.
r~
