NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2026-08-08 12:08:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

guest: Fold add_default_devices into set_defaults

Browse Source 
It doesn't have any need anymore to be separate
This commit is contained in:
Cole Robinson
2018-09-04 14:55:04 -04:00
parent f1bbc5f67a
commit c154bbacd4
7 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/xmlconfig-xml/install-hyperv-clock.xml
+13 -1
View File
@@ -52,6 +52,16 @@
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
@@ -59,6 +69,8 @@
<console type="pty"/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1" keymap="ja"/>
<sound model="ich6"/>
<video>
<model type="qxl"/>
</video>
</devices>
</domain>
tests/xmlconfig-xml/install-hyperv-noclock.xml
+13 -1
View File
@@ -51,6 +51,16 @@
<target dev="hdc" bus="ide"/>
<readonly/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>
<controller type="usb" index="0" model="ich9-uhci1">
<master startport="0"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci2">
<master startport="2"/>
</controller>
<controller type="usb" index="0" model="ich9-uhci3">
<master startport="4"/>
</controller>
<interface type="network">
<source network="default"/>
<mac address="22:22:33:44:55:66"/>
@@ -58,6 +68,8 @@
<console type="pty"/>
<input type="tablet" bus="usb"/>
<graphics type="vnc" port="-1" keymap="ja"/>
<sound model="ich6"/>
<video>
<model type="qxl"/>
</video>
</devices>
</domain>
tests/xmlconfig.py
-3
View File
@@ -43,9 +43,6 @@ def _make_guest(installer=None, conn=None, os_variant=None):
if os_variant:
g.os_variant = os_variant
g.add_default_input_device()
g.add_default_console_device()
g.add_device(virtinst.DeviceSound(g.conn))
# Floppy disk
path = "/dev/default-pool/testvol1.img"
virt-install
-2
View File
@@ -586,8 +586,6 @@ def build_guest_instance(conn, options):
validate_required_options(options, guest)
set_distro_variant(options, guest)
guest.add_default_devices()
check_option_collisions(options, guest)
show_warnings(options, guest)
virtManager/create.py
+6 -13
View File
@@ -1582,19 +1582,12 @@ class vmmCreate(vmmGObjectUI):
# on page 1.
pass
# Set up default devices
try:
guest.default_graphics_type = self.config.get_graphics_type()
guest.skip_default_sound = not self.config.get_new_vm_sound()
guest.skip_default_usbredir = (
self.config.get_add_spice_usbredir() == "no")
guest.x86_cpu_default = self.config.get_default_cpu_setting(
for_cpu=True)
guest.add_default_devices()
except Exception as e:
self.err.show_err(_("Error setting up default devices:") + str(e))
return None
guest.default_graphics_type = self.config.get_graphics_type()
guest.skip_default_sound = not self.config.get_new_vm_sound()
guest.skip_default_usbredir = (
self.config.get_add_spice_usbredir() == "no")
guest.x86_cpu_default = self.config.get_default_cpu_setting(
for_cpu=True)
return guest
virtconv/formats.py
-1
View File
@@ -213,7 +213,6 @@ class VirtConverter(object):
self._guest = self.parser.export_libvirt(self.conn,
self._input_file)
self._guest.add_default_devices()
def __del__(self):
for f in self._force_clean:
virtinst/guest.py
+15 -16
View File
@@ -352,7 +352,7 @@ class Guest(XMLBuilder):
return False
return all([c.model == "none" for c in controllers])
def add_default_input_device(self):
def _add_default_input_device(self):
if self.os.is_container():
return
if self.devices.input:
@@ -381,7 +381,7 @@ class Guest(XMLBuilder):
dev.bus = "usb"
self.add_device(dev)
def add_default_console_device(self):
def _add_default_console_device(self):
if self.skip_default_console:
return
if self.devices.console or self.devices.serial:
@@ -393,7 +393,7 @@ class Guest(XMLBuilder):
dev.target_type = "sclp"
self.add_device(dev)
def add_default_video_device(self):
def _add_default_video_device(self):
if self.os.is_container():
return
if self.devices.video:
@@ -402,7 +402,7 @@ class Guest(XMLBuilder):
return
self.add_device(DeviceVideo(self.conn))
def add_default_usb_controller(self):
def _add_default_usb_controller(self):
if self.os.is_container():
return
if any([d.type == "usb" for d in self.devices.controller]):
@@ -432,7 +432,7 @@ class Guest(XMLBuilder):
self.add_device(
DeviceController.get_usb3_controller(self.conn, self))
def add_default_channels(self):
def _add_default_channels(self):
if self.skip_default_channel:
return
if self.devices.channel:
@@ -450,7 +450,7 @@ class Guest(XMLBuilder):
dev.target_name = dev.CHANNEL_NAME_QEMUGA
self.add_device(dev)
def add_default_graphics(self):
def _add_default_graphics(self):
if self.skip_default_graphics:
return
if self.devices.graphics:
@@ -461,7 +461,7 @@ class Guest(XMLBuilder):
return
self.add_device(DeviceGraphics(self.conn))
def add_default_rng(self):
def _add_default_rng(self):
if self.skip_default_rng:
return
if self.devices.rng:
@@ -479,15 +479,6 @@ class Guest(XMLBuilder):
dev.device = "/dev/urandom"
self.add_device(dev)
def add_default_devices(self):
self.add_default_graphics()
self.add_default_video_device()
self.add_default_input_device()
self.add_default_console_device()
self.add_default_usb_controller()
self.add_default_channels()
self.add_default_rng()
def set_defaults(self, _guest):
if not self.uuid:
self.uuid = util.generate_uuid(self.conn)
@@ -496,6 +487,14 @@ class Guest(XMLBuilder):
if self.os.is_xenpv() or self.type == "vz":
self.emulator = None
self._add_default_graphics()
self._add_default_video_device()
self._add_default_input_device()
self._add_default_console_device()
self._add_default_usb_controller()
self._add_default_channels()
self._add_default_rng()
self.clock.set_defaults(self)
self.cpu.set_defaults(self)
self.features.set_defaults(self)