diff options
| author | Peter Maydell | 2018-06-26 13:49:24 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-26 13:49:24 +0200 |
| commit | bd4e4a387aa733e40270a7406c7d111f2292de65 (patch) | |
| tree | 3c24bbcd0dcb1a0b416817805020adb89a6f8be5 /hw/net/virtio-net.c | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' in... (diff) | |
| parent | hw/i386: Deprecate the machine types pc-0.10 and pc-0.11 (diff) | |
| download | qemu-bd4e4a387aa733e40270a7406c7d111f2292de65.tar.gz qemu-bd4e4a387aa733e40270a7406c7d111f2292de65.tar.xz qemu-bd4e4a387aa733e40270a7406c7d111f2292de65.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
Machine queue, 2018-06-25
* Don't support --daemonize and --preconfig together
* Deprecate machine types pc-0.10 and pc-0.11
# gpg: Signature made Mon 25 Jun 2018 23:37:59 BST
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-next-pull-request:
hw/i386: Deprecate the machine types pc-0.10 and pc-0.11
vl.c: do not allow --daemonize in combination with --preconfig CLI option
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions