[PATCH] qemu: Add support for -device ati-vga (models: rage128p and rv100)
Steven Newbury
steve at snewbury.org.uk
Wed Oct 7 13:05:14 UTC 2020
Please see the other patch, I copy/pasted the wrong text!
On Wed, 2020-10-07 at 13:50 +0100, Steven Newbury wrote:
> When using a passthrough GPU with libvirt there is no option to
> pass "x-vga=on" to the device specification. This means legacy
> VGA support isn't available which prevents any non-UEFI cards from
> POSTing and prevents some drivers from initialising for example
> Windows 10 NVIDIA driver for GeForce 8800.
>
> Signed-off-by: Steven Newbury <steve at snewbury.org.uk>
> ---
> docs/schemas/domaincommon.rng | 2 ++
> src/conf/domain_conf.c | 7 +++++++
> src/conf/domain_conf.h | 2 ++
> src/qemu/qemu_capabilities.c | 6 ++++++
> src/qemu/qemu_capabilities.h | 1 +
> src/qemu/qemu_command.c | 6 ++++++
> src/qemu/qemu_domain_address.c | 2 ++
> src/qemu/qemu_process.c | 2 ++
> tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 +
> tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 +
> tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 +
> 12 files changed, 32 insertions(+)
>
> diff --git a/docs/schemas/domaincommon.rng
> b/docs/schemas/domaincommon.rng
> index 7d4b105981..d52eb293a8 100644
> --- a/docs/schemas/domaincommon.rng
> +++ b/docs/schemas/domaincommon.rng
> @@ -3915,6 +3915,8 @@
> <value>none</value>
> <value>bochs</value>
> <value>ramfb</value>
> + <value>rage128p</value>
> + <value>rv100</value>
> </choice>
> </attribute>
> <group>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index c003b5c030..5d8b6a7611 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -811,6 +811,8 @@ VIR_ENUM_IMPL(virDomainVideo,
> "none",
> "bochs",
> "ramfb",
> + "rage128p",
> + "rv100",
> );
>
> VIR_ENUM_IMPL(virDomainVideoVGAConf,
> @@ -16016,6 +16018,11 @@ virDomainVideoDefaultRAM(const virDomainDef
> *def,
> /* QEMU use 64M as the minimal video memory for qxl device
> */
> return 64 * 1024;
>
> + case VIR_DOMAIN_VIDEO_TYPE_RAGE128P:
> + case VIR_DOMAIN_VIDEO_TYPE_RV100:
> + /* The real world devices started at 16M */
> + return 16 * 1024;
> +
> case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
> case VIR_DOMAIN_VIDEO_TYPE_VBOX:
> case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index 450686dfb5..b12c7ab00d 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -1502,6 +1502,8 @@ typedef enum {
> VIR_DOMAIN_VIDEO_TYPE_NONE,
> VIR_DOMAIN_VIDEO_TYPE_BOCHS,
> VIR_DOMAIN_VIDEO_TYPE_RAMFB,
> + VIR_DOMAIN_VIDEO_TYPE_RAGE128P,
> + VIR_DOMAIN_VIDEO_TYPE_RV100,
>
> VIR_DOMAIN_VIDEO_TYPE_LAST
> } virDomainVideoType;
> diff --git a/src/qemu/qemu_capabilities.c
> b/src/qemu/qemu_capabilities.c
> index 38b901a6c4..0b2bd24619 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -600,6 +600,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
>
> /* 380 */
> "usb-host.hostdevice",
> + "ati-vga",
> );
>
>
> @@ -1325,6 +1326,7 @@ struct virQEMUCapsStringFlags
> virQEMUCapsObjectTypes[] = {
> { "tcg-accel", QEMU_CAPS_TCG },
> { "pvscsi", QEMU_CAPS_SCSI_PVSCSI },
> { "spapr-tpm-proxy", QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY },
> + { "ati-vga", QEMU_CAPS_DEVICE_ATI_VGA },
> };
>
>
> @@ -6127,6 +6129,10 @@
> virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps,
> VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType,
> VIR_DOMAIN_VIDEO_TYPE_BOCHS);
> if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_RAMFB))
> VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType,
> VIR_DOMAIN_VIDEO_TYPE_RAMFB);
> + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_ATI_VGA)) {
> + VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType,
> VIR_DOMAIN_VIDEO_TYPE_RAGE128P);
> + VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType,
> VIR_DOMAIN_VIDEO_TYPE_RV100);
> + }
> }
>
>
> diff --git a/src/qemu/qemu_capabilities.h
> b/src/qemu/qemu_capabilities.h
> index 107056ba17..e316bd1532 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -580,6 +580,7 @@ typedef enum { /* virQEMUCapsFlags grouping
> marker for syntax-check */
>
> /* 380 */
> QEMU_CAPS_USB_HOST_HOSTDEVICE, /* -device usb-host.hostdevice */
> + QEMU_CAPS_DEVICE_ATI_VGA, /* -device ati-vga */
>
> QEMU_CAPS_LAST /* this must always be the last item */
> } virQEMUCapsFlags;
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 476cf6972e..b501b8e3e2 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -101,6 +101,8 @@ VIR_ENUM_IMPL(qemuVideo,
> "" /* 'none' doesn't make sense here */,
> "bochs-display",
> "", /* ramfb can't be used with -vga */
> + "rage128p",
> + "rv100",
> );
>
> VIR_ENUM_DECL(qemuDeviceVideo);
> @@ -120,6 +122,8 @@ VIR_ENUM_IMPL(qemuDeviceVideo,
> "" /* 'none' doesn't make sense here */,
> "bochs-display",
> "ramfb",
> + "ati-vga" /* (rage128p) */,
> + "ati-vga" /* (rv100) */,
> );
>
> VIR_ENUM_DECL(qemuDeviceVideoSecondary);
> @@ -139,6 +143,8 @@ VIR_ENUM_IMPL(qemuDeviceVideoSecondary,
> "" /* 'none' doesn't make sense here */,
> "" /* no secondary device for bochs */,
> "" /* no secondary device for ramfb */,
> + "" /* no secondary device for ati-vga? (rage128p) */,
> + "" /* no secondary device for ati-vga? (rv100) */,
> );
>
> VIR_ENUM_IMPL(qemuSoundCodec,
> diff --git a/src/qemu/qemu_domain_address.c
> b/src/qemu/qemu_domain_address.c
> index dd87915a97..d8273af92f 100644
> --- a/src/qemu/qemu_domain_address.c
> +++ b/src/qemu/qemu_domain_address.c
> @@ -964,6 +964,8 @@
> qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
> case VIR_DOMAIN_VIDEO_TYPE_VBOX:
> case VIR_DOMAIN_VIDEO_TYPE_QXL:
> case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
> + case VIR_DOMAIN_VIDEO_TYPE_RAGE128P:
> + case VIR_DOMAIN_VIDEO_TYPE_RV100:
> return pciFlags;
>
> case VIR_DOMAIN_VIDEO_TYPE_BOCHS:
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 6b5de29fdb..09aac14430 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -3111,6 +3111,8 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr
> driver,
> case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
> case VIR_DOMAIN_VIDEO_TYPE_XEN:
> case VIR_DOMAIN_VIDEO_TYPE_VBOX:
> + case VIR_DOMAIN_VIDEO_TYPE_RAGE128P:
> + case VIR_DOMAIN_VIDEO_TYPE_RV100:
> case VIR_DOMAIN_VIDEO_TYPE_LAST:
> break;
> }
> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
> b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
> index 928af2a01c..30609085e1 100644
> --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
> +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
> @@ -199,6 +199,7 @@
> <flag name='migration-param.xbzrle-cache-size'/>
> <flag name='numa.hmat'/>
> <flag name='blockdev-hostdev-scsi'/>
> + <flag name='ati-vga'/>
> <version>5000000</version>
> <kvmVersion>0</kvmVersion>
> <microcodeVersion>61700241</microcodeVersion>
> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
> b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
> index e8668a25a9..254da198b2 100644
> --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
> +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
> @@ -208,6 +208,7 @@
> <flag name='spapr-tpm-proxy'/>
> <flag name='numa.hmat'/>
> <flag name='blockdev-hostdev-scsi'/>
> + <flag name='ati-vga'/>
> <version>5000000</version>
> <kvmVersion>0</kvmVersion>
> <microcodeVersion>42900241</microcodeVersion>
> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
> b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
> index 546b9b0422..ae6e66679b 100644
> --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
> +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
> @@ -243,6 +243,7 @@
> <flag name='intel-iommu.aw-bits'/>
> <flag name='numa.hmat'/>
> <flag name='blockdev-hostdev-scsi'/>
> + <flag name='ati-vga'/>
> <version>5000000</version>
> <kvmVersion>0</kvmVersion>
> <microcodeVersion>43100241</microcodeVersion>
> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
> b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
> index 987beb965e..33929735f5 100644
> --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
> +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
> @@ -243,6 +243,7 @@
> <flag name='numa.hmat'/>
> <flag name='blockdev-hostdev-scsi'/>
> <flag name='usb-host.hostdevice'/>
> + <flag name='ati-vga'/>
> <version>5001000</version>
> <kvmVersion>0</kvmVersion>
> <microcodeVersion>43100242</microcodeVersion>
More information about the libvir-list
mailing list