summary refs log tree commit diff stats
path: root/hw/net/virtio-net.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-06-18 11:23:15 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-06-18 11:23:15 +0100
commit3f429a3400822141651486193d6af625eeab05a5 (patch)
tree19a4c8e548a6c3084577a1d593da042f973d7a7d /hw/net/virtio-net.c
parentbac8d222a19f4a30d0a17980bd932f23a6af77bb (diff)
parentc8b473594b8fbba169a6ea950493a3015d15a18d (diff)
downloadfocaccia-qemu-3f429a3400822141651486193d6af625eeab05a5.tar.gz
focaccia-qemu-3f429a3400822141651486193d6af625eeab05a5.zip
Merge remote-tracking branch 'remotes/kraxel/tags/microvm-20200617-pull-request' into staging
microvm: memory config tweaks

# gpg: Signature made Wed 17 Jun 2020 13:28:44 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/microvm-20200617-pull-request:
  microvm: move virtio base to 0xfeb00000
  x86: move max-ram-below-4g to pc
  microvm: drop max-ram-below-4g support
  microvm: use 3G split unconditionally

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions