diff options
| author | Richard Henderson | 2021-10-05 01:27:35 +0200 |
|---|---|---|
| committer | Richard Henderson | 2021-10-05 01:27:35 +0200 |
| commit | 9618c5badaa8eed25259cf095ff880efb939fbe7 (patch) | |
| tree | de429ff2c502d2f6cc19c9dad4037b6ce267c88d /hw/remote/proxy.c | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/linux-user-for-6.2-pull-req... (diff) | |
| parent | hw/remote/proxy: Categorize Wireless devices as 'Network' ones (diff) | |
| download | qemu-9618c5badaa8eed25259cf095ff880efb939fbe7.tar.gz qemu-9618c5badaa8eed25259cf095ff880efb939fbe7.tar.xz qemu-9618c5badaa8eed25259cf095ff880efb939fbe7.zip | |
Merge remote-tracking branch 'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging
Pull request trivial-patches 2021104
# gpg: Signature made Mon 04 Oct 2021 01:30:22 AM PDT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
* remotes/vivier/tags/trivial-branch-for-6.2-pull-request:
hw/remote/proxy: Categorize Wireless devices as 'Network' ones
target/sh4: Use lookup_symbol in sh4_tr_disas_log
qemu-options: Add missing "sockets=2, maxcpus=2" to CLI "-smp 2"
qemu-options: Tweak [, maxcpus=cpus] to [, maxcpus=maxcpus]
qemu-options: -chardev reconnect=seconds duplicated in help, tidy up
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/remote/proxy.c')
| -rw-r--r-- | hw/remote/proxy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c index 499f540c94..bad164299d 100644 --- a/hw/remote/proxy.c +++ b/hw/remote/proxy.c @@ -324,6 +324,7 @@ static void probe_pci_info(PCIDevice *dev, Error **errp) set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); break; case PCI_BASE_CLASS_NETWORK: + case PCI_BASE_CLASS_WIRELESS: set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); break; case PCI_BASE_CLASS_INPUT: |