diff options
| author | Stefan Hajnoczi | 2022-10-12 22:00:15 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2022-10-12 22:00:15 +0200 |
| commit | cdcb7dcb401757b5853ca99c1967a6d66e1deea5 (patch) | |
| tree | 629a0b8da58fe630498804183659a7e6818cd655 /hw/virtio/vhost-user.c | |
| parent | Merge tag 'pull-target-arm-20221010' of https://git.linaro.org/people/pmaydel... (diff) | |
| parent | x86: pci: acpi: consolidate PCI slots creation (diff) | |
| download | qemu-cdcb7dcb401757b5853ca99c1967a6d66e1deea5.tar.gz qemu-cdcb7dcb401757b5853ca99c1967a6d66e1deea5.tar.xz qemu-cdcb7dcb401757b5853ca99c1967a6d66e1deea5.zip | |
Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging
pc,virtio: features, tests, fixes, cleanups
virtio introspection
new serial number opton for cxl
vhost user blk dynamic config size
virtio-gpio vhost user backend
Tests fixes cleanups all over the place
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAmNEVeoPHG1zdEByZWRo
# YXQuY29tAAoJECgfDbjSjVRph8YH+gMWpb5IglE0Q+H2JiQPBwB/Ghy1ohRKnOvZ
# lChB7+oy18o2xXRFTOXwG9Ijqsbdn0QMbU/r3NWxBuMzxDow012xiMDniJlJmcXw
# /4POOCSTKrIfzVBhsEErVSA9NwSE5cQKr1oiRBGIa9UdZfZ//v7s6SoP4vtyj8RZ
# UJVYVnMDtq/0PaN92IMs06lhqo/LkegE7gTGHMBf8Nvw4SgQoZgfPyp1eR+dKOhz
# lXNqqvTds9yt8yS65UWbuSrZ9d7GpCQf8nuyLaLaENHd6FQUVfmTTT37l2EKziwp
# PK0EwWMHeGkj7LHrylztradhE9xBlIW23ROP8wPdGZHmgLNHbC0=
# =20Zb
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 10 Oct 2022 13:27:06 EDT
# gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg: issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu: (55 commits)
x86: pci: acpi: consolidate PCI slots creation
tests: acpi: update expected blobs
x86: pci: acpi: reorder Device's _DSM method
tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
tests: acpi: update expected blobs
x86: pci: acpi: reorder Device's _ADR and _SUN fields
tests: acpi: whitelist pc/q35 DSDT before moving _ADR field
tests: acpi: update expected blobs
x86: acpi: cleanup PCI device _DSM duplication
tests: acpi: whitelist pc/q35 DSDT before switching _DSM to use ASUN
tests: acpi: update expected blobs
x86: acpi: _DSM: use Package to pass parameters
acpi: x86: refactor PDSM method to reduce nesting
tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
tests: acpi: update expected blobs after HPET move
acpi: x86: deduplicate HPET AML building
tests: acpi: whitelist pc/q35 DSDT due to HPET AML move
hw/smbios: support for type 8 (port connector)
pci: Sanity check mask argument to pci_set_*_by_mask()
pci: Remove unused pci_get_*_by_mask() functions
...
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/virtio/vhost-user.c')
| -rw-r--r-- | hw/virtio/vhost-user.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 70748e61e0..03415b6c95 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -200,7 +200,7 @@ typedef struct { VhostUserRequest request; #define VHOST_USER_VERSION_MASK (0x3) -#define VHOST_USER_REPLY_MASK (0x1<<2) +#define VHOST_USER_REPLY_MASK (0x1 << 2) #define VHOST_USER_NEED_REPLY_MASK (0x1 << 3) uint32_t flags; uint32_t size; /* the following payload size */ @@ -208,7 +208,7 @@ typedef struct { typedef union { #define VHOST_USER_VRING_IDX_MASK (0xff) -#define VHOST_USER_VRING_NOFD_MASK (0x1<<8) +#define VHOST_USER_VRING_NOFD_MASK (0x1 << 8) uint64_t u64; struct vhost_vring_state state; struct vhost_vring_addr addr; @@ -248,7 +248,8 @@ struct vhost_user { size_t region_rb_len; /* RAMBlock associated with a given region */ RAMBlock **region_rb; - /* The offset from the start of the RAMBlock to the start of the + /* + * The offset from the start of the RAMBlock to the start of the * vhost region. */ ram_addr_t *region_rb_offset; @@ -1460,7 +1461,14 @@ static int vhost_user_set_features(struct vhost_dev *dev, */ bool log_enabled = features & (0x1ULL << VHOST_F_LOG_ALL); - return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features, + /* + * We need to include any extra backend only feature bits that + * might be needed by our device. Currently this includes the + * VHOST_USER_F_PROTOCOL_FEATURES bit for enabling protocol + * features. + */ + return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, + features | dev->backend_features, log_enabled); } |