From 1fb68633052d8e32d00dc8c7651c1908f319a5df Mon Sep 17 00:00:00 2001
From: zhaoshuang <zhaoshuang@uniontech.com>
Date: Tue, 2 Sep 2025 14:03:51 +0800
Subject: [PATCH] add some default devices to improve user experience

---
 add-some-default-devices.patch | 91 ++++++++++++++++++++++++++++++++++
 virt-manager.spec              |  6 ++-
 2 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 add-some-default-devices.patch

diff --git a/add-some-default-devices.patch b/add-some-default-devices.patch
new file mode 100644
index 0000000..13de7f9
--- /dev/null
+++ b/add-some-default-devices.patch
@@ -0,0 +1,91 @@
+From 7c441c5ca6a5913234cf19246e184f5f0ac59c9e Mon Sep 17 00:00:00 2001
+From: Super User <root@localhost.localdomain>
+Date: Wed, 14 May 2025 15:14:19 +0800
+Subject: [PATCH] add some default devices
+
+---
+ virtinst/guest.py | 33 ++++++++++++++++++++++++++++-----
+ 1 file changed, 28 insertions(+), 5 deletions(-)
+
+diff --git a/virtinst/guest.py b/virtinst/guest.py
+index 86f6e14..46664af 100644
+--- a/virtinst/guest.py
++++ b/virtinst/guest.py
+@@ -17,7 +17,6 @@ from .domcapabilities import DomainCapabilities
+ from .logger import log
+ from .osdict import OSDB
+ from .xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty
+-
+ _ignore = Device
+ 
+ 
+@@ -353,7 +352,9 @@ class Guest(XMLBuilder):
+             self.os.is_riscv_virt() or
+             self.os.is_s390x() or
+             self.os.is_pseries() or
+-            self.os.is_loongarch64()):
++            self.os.is_loongarch64() or
++            self.os.is_arm() or
++            self.os.is_sw_64()):
+             return True
+ 
+         if not os_support:
+@@ -904,8 +905,9 @@ class Guest(XMLBuilder):
+         if (self.os.is_arm_machvirt() or
+             self.os.is_riscv_virt() or
+             self.os.is_pseries() or
+-            self.os.is_loongarch64()):
+-            usb_tablet = True
++            self.os.is_loongarch64() or
++            self.os.is_arm() or
++            self.os.is_sw_64()):
+             usb_keyboard = True
+ 
+         if usb_tablet:
+@@ -929,6 +931,14 @@ class Guest(XMLBuilder):
+             dev.type = "keyboard"
+             dev.bus = "virtio"
+             self.add_device(dev)
++        if (self.os.is_arm_machvirt() or
++            self.os.is_loongarch64() or
++            self.os.is_arm() or
++            self.os.is_sw_64()):
++            dev = DeviceInput(self.conn)
++            dev.type = "tablet"
++            dev.bus = "virtio"
++            self.add_device(dev)
+ 
+     def _add_default_console_device(self):
+         if self.skip_default_console:
+@@ -991,6 +1001,16 @@ class Guest(XMLBuilder):
+             if (qemu_usb3 and
+                 self.conn.support.conn_machvirt_pci_default()):
+                 usb3 = True
++        elif self.os.is_arm():
++            # For machvirt, we always assume OS supports usb3
++            if (qemu_usb3 and
++                self.conn.support.conn_machvirt_pci_default()):
++                usb3 = True
++        elif self.os.is_sw_64():
++            # For machvirt, we always assume OS supports usb3
++            if (qemu_usb3 and
++                self.conn.support.conn_machvirt_pci_default()):
++                usb3 = True
+ 
+         if usb2:
+             for dev in DeviceController.get_usb2_controllers(self.conn):
+@@ -1022,7 +1042,10 @@ class Guest(XMLBuilder):
+         if self.os.is_container() and not self.conn.is_vz():
+             return
+         if (not self.os.is_x86() and
+-            not self.os.is_pseries() and not self.os.is_loongarch64()):
++            not self.os.is_pseries() and
++            not self.os.is_loongarch64() and
++            not self.os.is_arm() and
++            not self.os.is_sw_64()):
+             return
+         self.add_device(DeviceGraphics(self.conn))
+ 
+-- 
+2.43.0
+
diff --git a/virt-manager.spec b/virt-manager.spec
index 6a2167e..9427594 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -2,7 +2,7 @@
 
 Name:                virt-manager
 Version:             4.1.0
-Release:             8
+Release:             9
 Summary:             The manage virtual machines tool which via libvirt.
 License:             GPLv2+
 BuildArch:           noarch
@@ -29,6 +29,7 @@ Patch17:             backport-virt-install-unattended-and-cloud-init-conflict.pa
 Patch18:             backport-virt-install-Reuse-cli.fail_conflicting.patch
 Patch19:             backport-cli-support-boot-loader.stateless.patch
 Patch20:             backport-diskbackend-Drop-support-for-sheepdog.patch
+Patch21:             add-some-default-devices.patch
 
 Requires:            virt-manager-common = %{version}-%{release} python3-gobject gtk3 libvirt-glib >= 0.0.9
 Requires:            gtk-vnc2 dconf vte291 gtksourceview4
@@ -106,6 +107,9 @@ done
 %{_mandir}/man1/{virt-install.1*,virt-clone.1*,virt-xml.1*}
 
 %changelog
+* Tue Sep 02 2025 kkz <zhaoshuang@uniontech.com> - 4.1.0-9
+- feat: add some default devices to improve user experience‌
+
 * Wed Aug 21 2024 yanjianqing <yanjianqing@kylinos.cn> - 4.1.0-8
 - diskbackend: Drop support for sheepdog
 - cli: support --boot loader.stateless=
-- 
Gitee