diff options
| author | Peter Maydell | 2018-03-05 15:27:24 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-03-05 15:27:24 +0100 |
| commit | 41dfc0dc55f0b338ab3c1d29a1721441b76ebd03 (patch) | |
| tree | ad63b36baa4dc7bdecef827063cdba2091d1fed7 /include/sysemu/sysemu.h | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request'... (diff) | |
| parent | tap: setting error appropriately when calling net_init_tap_one() (diff) | |
| download | qemu-41dfc0dc55f0b338ab3c1d29a1721441b76ebd03.tar.gz qemu-41dfc0dc55f0b338ab3c1d29a1721441b76ebd03.tar.xz qemu-41dfc0dc55f0b338ab3c1d29a1721441b76ebd03.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 05 Mar 2018 03:06:59 GMT
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
tap: setting error appropriately when calling net_init_tap_one()
hw/net: Remove unnecessary header includes
net: Add a new convenience option "--nic" to configure default/on-board NICs
net: Remove the deprecated 'host_net_add' and 'host_net_remove' HMP commands
net: Remove the deprecated way of dumping network packets
net: Make net_client_init() static
net: Only show vhost-user in the help text if CONFIG_POSIX is defined
net: List available netdevs with "-netdev help"
net: Move error reporting from net_init_client/netdev to the calling site
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/sysemu/sysemu.h')
| -rw-r--r-- | include/sysemu/sysemu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index bfbef9e69c..d24ad09f37 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -198,6 +198,7 @@ extern QemuOptsList bdrv_runtime_opts; extern QemuOptsList qemu_chardev_opts; extern QemuOptsList qemu_device_opts; extern QemuOptsList qemu_netdev_opts; +extern QemuOptsList qemu_nic_opts; extern QemuOptsList qemu_net_opts; extern QemuOptsList qemu_global_opts; extern QemuOptsList qemu_mon_opts; |