diff mbox

[RFC,05/18] qemu.py: Split _base_args()

Message ID 20180329213857.15499-6-ehabkost@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eduardo Habkost March 29, 2018, 9:38 p.m. UTC 
Split it into _monitor_args() and _display_args(), so we can make
monitor args optional later.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 scripts/qemu.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Philippe Mathieu-Daudé April 4, 2018, 8:27 a.m. UTC | #1 
On 03/29/2018 06:38 PM, Eduardo Habkost wrote:
> Split it into _monitor_args() and _display_args(), so we can make
> monitor args optional later.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  scripts/qemu.py | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/qemu.py b/scripts/qemu.py
> index c051c4525a..d9f85bb153 100644
> --- a/scripts/qemu.py
> +++ b/scripts/qemu.py
> @@ -173,15 +173,20 @@ class QEMUMachine(object):
>          else:
>              return os.path.join(self._temp_dir, self._name + "-monitor.sock")
>  
> -    def _base_args(self):
> +    def _monitor_args(self):
>          addr = self._vm_monitor()
>          if isinstance(addr, tuple):
>              moncdev = "socket,id=mon,host=%s,port=%s" % (addr[0], addr[1])
>          else:
>              moncdev = 'socket,id=mon,path=%s' % (addr)
>          return ['-chardev', moncdev,
> -                '-mon', 'chardev=mon,mode=control',
> -                '-display', 'none', '-vga', 'none']
> +                '-mon', 'chardev=mon,mode=control']
> +
> +    def _display_args(self):
> +        return ['-display', 'none', '-vga', 'none']
> +
> +    def _base_args(self):
> +        return self._monitor_args() + self._display_args()
>  
>      def _pre_launch(self):
>          self._temp_dir = tempfile.mkdtemp(dir=self._test_dir)
>
diff mbox

Patch

diff --git a/scripts/qemu.py b/scripts/qemu.py
index c051c4525a..d9f85bb153 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -173,15 +173,20 @@  class QEMUMachine(object):
         else:
             return os.path.join(self._temp_dir, self._name + "-monitor.sock")
 
-    def _base_args(self):
+    def _monitor_args(self):
         addr = self._vm_monitor()
         if isinstance(addr, tuple):
             moncdev = "socket,id=mon,host=%s,port=%s" % (addr[0], addr[1])
         else:
             moncdev = 'socket,id=mon,path=%s' % (addr)
         return ['-chardev', moncdev,
-                '-mon', 'chardev=mon,mode=control',
-                '-display', 'none', '-vga', 'none']
+                '-mon', 'chardev=mon,mode=control']
+
+    def _display_args(self):
+        return ['-display', 'none', '-vga', 'none']
+
+    def _base_args(self):
+        return self._monitor_args() + self._display_args()
 
     def _pre_launch(self):
         self._temp_dir = tempfile.mkdtemp(dir=self._test_dir)