From 6c5f6cdab95c7c98b8a0ee6a7e6ccbab450ed7fc Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 28 Aug 2018 17:40:27 +0200 Subject: [PATCH] qemu: Add more defaults for RISC-V virt guests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We would have used virtio for networking anyway, but it's better to be explicit; for graphics, none of the existing models work right now but virtio is the only one which has a non-PCI variant, so it's as good a default as any Spotted-by: Ján Tomko Signed-off-by: Andrea Bolognani Reviewed-by: Ján Tomko --- src/qemu/qemu_domain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d7d145b9d4..d052bf4ca8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5847,6 +5847,10 @@ qemuDomainDefaultNetModel(const virDomainDef *def, return "lan9118"; } + /* virtio is a sensible default for RISC-V virt guests */ + if (qemuDomainIsRISCVVirt(def)) + return "virtio"; + /* In all other cases the model depends on the capabilities. If they were * not provided don't report any default. */ if (!qemuCaps) @@ -6337,7 +6341,9 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { if (ARCH_IS_PPC64(def->os.arch)) video->type = VIR_DOMAIN_VIDEO_TYPE_VGA; - else if (qemuDomainIsARMVirt(def) || ARCH_IS_S390(def->os.arch)) + else if (qemuDomainIsARMVirt(def) || + qemuDomainIsRISCVVirt(def) || + ARCH_IS_S390(def->os.arch)) video->type = VIR_DOMAIN_VIDEO_TYPE_VIRTIO; else video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; -- 2.39.5