From bec4de2342b153531d0128718f6b953727dc3f8d Mon Sep 17 00:00:00 2001 From: Yadong Qi Date: Wed, 11 May 2022 14:14:15 +0800 Subject: [PATCH 1/2] revert back virtio-vga to virtio-gpu-pci Signed-off-by: Yadong Qi --- src/guest/start.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/guest/start.c b/src/guest/start.c index 5f5b14df..fa895660 100644 --- a/src/guest/start.c +++ b/src/guest/start.c @@ -1008,14 +1008,14 @@ int start_guest(char *name) p += cx; size -= cx; set_aaf_option(AAF_CONFIG_GPU_TYPE, AAF_GPU_TYPE_GVTD); } else if (strcmp(val, VGPU_OPTS_VIRTIO_STR) == 0) { - cx = snprintf(p, size, " -display gtk,gl=on -device virtio-vga-gl"); + cx = snprintf(p, size, " -display gtk,gl=on -device virtio-gpu-pci"); p += cx; size -= cx; set_aaf_option(AAF_CONFIG_GPU_TYPE, AAF_GPU_TYPE_VIRTIO); } else if (strcmp(val, VGPU_OPTS_RAMFB_STR) == 0) { cx = snprintf(p, size, " -display gtk,gl=on -device ramfb"); p += cx; size -= cx; } else if (strcmp(val, VGPU_OPTS_VIRTIO2D_STR) == 0) { - cx = snprintf(p, size, " -display gtk,gl=on -device virtio-vga"); + cx = snprintf(p, size, " -display gtk,gl=on -device virtio-gpu-pci,virgl=off"); p += cx; size -= cx; set_aaf_option(AAF_CONFIG_GPU_TYPE, AAF_GPU_TYPE_VIRTIO); } else if (strcmp(val, VGPU_OPTS_SRIOV_STR) == 0) { From a3c4499b875b2fdb8434ba03564b464ec2c48477 Mon Sep 17 00:00:00 2001 From: Yadong Qi Date: Wed, 11 May 2022 14:16:12 +0800 Subject: [PATCH 2/2] Bump version to 0.6.1 Signed-off-by: Yadong Qi --- debian/changelog | 6 ++++++ src/vm_manager.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eba6df1f..2afdc850 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vm-manager (0.6.1) UNRELEASED; urgency=medium + + * Bum version to 0.6.1 + + -- Qi, Yadong Wed, 11 May 2022 14:14:39 +0800 + vm-manager (0.6.0) stable; urgency=medium * Bump version to 0.6.0 diff --git a/src/vm_manager.c b/src/vm_manager.c index 544fc2b2..9410f04d 100644 --- a/src/vm_manager.c +++ b/src/vm_manager.c @@ -21,7 +21,7 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 6 -#define VERSION_MICRO 0 +#define VERSION_MICRO 1 #define VERSION xstr(VERSION_MAJOR)"."xstr(VERSION_MINOR)"."xstr(VERSION_MICRO)