!15 Update to 42.1
From: @weijin-deng Reviewed-by: @zhang__3125 Signed-off-by: @zhang__3125
This commit is contained in:
commit
9d69a0c20d
@ -1,45 +0,0 @@
|
|||||||
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
|
|
||||||
index 6d817df..c75cd45 100644
|
|
||||||
--- a/src/vm-configurator.vala
|
|
||||||
+++ b/src/vm-configurator.vala
|
|
||||||
@@ -39,6 +39,13 @@
|
|
||||||
private const string LIBOSINFO_XML = "<libosinfo>%s</libosinfo>";
|
|
||||||
private const string LIBOSINFO_OS_ID_XML = "<os id=\"%s\"/>";
|
|
||||||
|
|
||||||
+ /* this var is used for passporting virt type information between function set_cpu_config and statement:
|
|
||||||
+ "var virt_type = guest_kvm_enabled (best_caps) ? DomainVirtType.KVM : DomainVirtType.QEMU;"
|
|
||||||
+ the concrete type of virt_type_p refers to /usr/share/vala/vapi/libvirt-gconfig-1.0.vapi:75: public GVirConfig.DomainVirtType get_virt_type ();
|
|
||||||
+ the virt_type_p must be static then member function create_domain_config and set_cpu_config can access it.
|
|
||||||
+ */
|
|
||||||
+ private static GVirConfig.DomainVirtType virt_type_p = DomainVirtType.QEMU;
|
|
||||||
+
|
|
||||||
private const bool SPICE_AVAILABLE =
|
|
||||||
#if HAS_SPICE
|
|
||||||
true;
|
|
||||||
@@ -54,9 +61,13 @@ public static Domain create_domain_config (InstallerMedia install_media, string
|
|
||||||
|
|
||||||
var best_caps = get_best_guest_caps (caps, install_media);
|
|
||||||
domain.memory = install_media.resources.ram / KIBIBYTES;
|
|
||||||
- set_cpu_config (domain, caps);
|
|
||||||
+ //set_cpu_config (domain, caps); //move this statement before statement:"domain.set_virt_type (virt_type);"
|
|
||||||
|
|
||||||
var virt_type = guest_kvm_enabled (best_caps) ? DomainVirtType.KVM : DomainVirtType.QEMU;
|
|
||||||
+ // passporting virt type information
|
|
||||||
+ virt_type_p = virt_type;
|
|
||||||
+ // new call position
|
|
||||||
+ set_cpu_config (domain, caps);
|
|
||||||
domain.set_virt_type (virt_type);
|
|
||||||
|
|
||||||
set_os_config (domain, install_media, best_caps, domain_caps);
|
|
||||||
@@ -233,7 +244,10 @@ private static void set_cpu_config (Domain domain, Capabilities caps) {
|
|
||||||
domain.vcpu = topology.get_sockets () * topology.get_cores () * topology.get_threads ();
|
|
||||||
|
|
||||||
var cpu = new DomainCpu ();
|
|
||||||
- cpu.set_mode (DomainCpuMode.HOST_PASSTHROUGH);
|
|
||||||
+ if(virt_type_p == DomainVirtType.QEMU)
|
|
||||||
+ cpu.set_mode (DomainCpuMode.HOST_MODEL);
|
|
||||||
+ else /* if virt_type_p == DomainVirtType.KVM or other */
|
|
||||||
+ cpu.set_mode (DomainCpuMode.HOST_PASSTHROUGH);
|
|
||||||
cpu.set_topology (topology);
|
|
||||||
|
|
||||||
domain.set_cpu (cpu);
|
|
||||||
Binary file not shown.
BIN
gnome-boxes-42.1.tar.xz
Normal file
BIN
gnome-boxes-42.1.tar.xz
Normal file
Binary file not shown.
@ -6,13 +6,12 @@
|
|||||||
%global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/gnome-boxes/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
|
%global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/gnome-boxes/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
|
||||||
|
|
||||||
Name: gnome-boxes
|
Name: gnome-boxes
|
||||||
Version: 42.0.1
|
Version: 42.1
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: An application of the GNOME Desktop Environment
|
Summary: An application of the GNOME Desktop Environment
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://wiki.gnome.org/Apps/Boxes
|
URL: https://wiki.gnome.org/Apps/Boxes
|
||||||
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz
|
||||||
Patch0: 0001-make-gnome-boxes-correctly-select-virtualization-cpu-mode.patch
|
|
||||||
Patch1: 0002-disable-domain-conf-video-model-qxl-because-qemu-not-open-this-support.patch
|
Patch1: 0002-disable-domain-conf-video-model-qxl-because-qemu-not-open-this-support.patch
|
||||||
Patch2: 0003-disable-domain-conf-smartcard-because-qemu-not-open-this-support-now.patch
|
Patch2: 0003-disable-domain-conf-smartcard-because-qemu-not-open-this-support-now.patch
|
||||||
Patch3: 0004-disable-domain-conf-spice-graphics-because-qemu-not-open-this-support-now-and-add-vnc-instead.patch
|
Patch3: 0004-disable-domain-conf-spice-graphics-because-qemu-not-open-this-support-now-and-add-vnc-instead.patch
|
||||||
@ -84,6 +83,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.deskt
|
|||||||
%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
|
%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 21 2022 weijin deng <weijin.deng@turbolinux.com.cn> - 42.1-1
|
||||||
|
- Update to 42.1
|
||||||
|
|
||||||
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.0.1-1
|
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.0.1-1
|
||||||
- Update to 42.0.1, Update four patches
|
- Update to 42.0.1, Update four patches
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user