diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-10 13:35:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-10 13:35:54 -0700 |
commit | dfc191544864601a056ce7691d600e70d60d3ca1 (patch) | |
tree | b8e11dd5fac75867be1f0e185fd79520811971dd /tools | |
parent | c118b59e71d2a910ee300f8be40fa864a91bb6ca (diff) | |
parent | 9da667e50c7e62266f3c2f8ad57b32fca40716b1 (diff) | |
download | linux-stable-dfc191544864601a056ce7691d600e70d60d3ca1.tar.gz linux-stable-dfc191544864601a056ce7691d600e70d60d3ca1.tar.bz2 linux-stable-dfc191544864601a056ce7691d600e70d60d3ca1.zip |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin:
"Some last minute fixes - most of them for regressions"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vdpa_sim_net: complete the initialization before register the device
vdpa/mlx5: Add and remove debugfs in setup/teardown driver
tools/virtio: fix typo in README instructions
vhost-scsi: Fix crash during LUN unmapping
vhost-scsi: Fix vhost_scsi struct use after free
virtio-blk: fix ZBD probe in kernels without ZBD support
virtio-blk: fix to match virtio spec
Diffstat (limited to 'tools')
-rw-r--r-- | tools/virtio/virtio-trace/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/virtio/virtio-trace/README b/tools/virtio/virtio-trace/README index b64845b823ab..4fb9368bf751 100644 --- a/tools/virtio/virtio-trace/README +++ b/tools/virtio/virtio-trace/README @@ -61,7 +61,7 @@ and id=channel0,name=agent-ctl-path\ ##data path## -chardev pipe,id=charchannel1,path=/tmp/virtio-trace/trace-path-cpu0\ - -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,\ + -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\ id=channel1,name=trace-path-cpu0\ ... |