qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com,
	peter.maydell@linaro.org,
	Murilo Opsfelder Araujo <muriloo@linux.ibm.com>,
	Juan Quintela <quintela@redhat.com>
Subject: [PULL 02/16] tests/migration: add support for ppc64le for guestperf.py
Date: Sun,  5 Feb 2023 07:04:35 -0300	[thread overview]
Message-ID: <20230205100449.2352781-3-danielhb413@gmail.com> (raw)
In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com>

From: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>

Add support for ppc64le for guestperf.py. On ppc, console is usually
hvc0 and serial device for pseries machine is spapr-vty.

Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20220809002451.91541-3-muriloo@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
 tests/migration/guestperf/engine.py | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index 59fca2c70b..cc06fac592 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -281,6 +281,26 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri):
                 resp = src.command("stop")
                 paused = True
 
+    def _is_ppc64le(self):
+        _, _, _, _, machine = os.uname()
+        if machine == "ppc64le":
+            return True
+        return False
+
+    def _get_guest_console_args(self):
+        if self._is_ppc64le():
+            return "console=hvc0"
+        else:
+            return "console=ttyS0"
+
+    def _get_qemu_serial_args(self):
+        if self._is_ppc64le():
+            return ["-chardev", "stdio,id=cdev0",
+                    "-device", "spapr-vty,chardev=cdev0"]
+        else:
+            return ["-chardev", "stdio,id=cdev0",
+                    "-device", "isa-serial,chardev=cdev0"]
+
     def _get_common_args(self, hardware, tunnelled=False):
         args = [
             "noapic",
@@ -289,8 +309,10 @@ def _get_common_args(self, hardware, tunnelled=False):
             "noreplace-smp",
             "cgroup_disable=memory",
             "pci=noearly",
-            "console=ttyS0",
         ]
+
+        args.append(self._get_guest_console_args())
+
         if self._debug:
             args.append("debug")
         else:
@@ -308,12 +330,12 @@ def _get_common_args(self, hardware, tunnelled=False):
             "-kernel", self._kernel,
             "-initrd", self._initrd,
             "-append", cmdline,
-            "-chardev", "stdio,id=cdev0",
-            "-device", "isa-serial,chardev=cdev0",
             "-m", str((hardware._mem * 1024) + 512),
             "-smp", str(hardware._cpus),
         ]
 
+        argv.extend(self._get_qemu_serial_args())
+
         if self._debug:
             argv.extend(["-device", "sga"])
 
-- 
2.39.1



  parent reply	other threads:[~2023-02-05 10:07 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 01/16] tests/migration: add sysprof-capture-4 as dependency for stress binary Daniel Henrique Barboza
2023-02-05 10:04 ` Daniel Henrique Barboza [this message]
2023-02-05 10:04 ` [PULL 03/16] ppc/pegasos2: Improve readability of VIA south bridge creation Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 04/16] hw/pci-host/mv64361: Reuse pci_swizzle_map_irq_fn Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 05/16] hw/ppc: Set machine->fdt in e500 machines Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 07/16] hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec() Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 08/16] hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 09/16] ppc/pnv/pci: Cleanup PnvPHBPecState structure Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 10/16] ppc/pnv/pci: Remove duplicate definition of PNV_PHB5_DEVICE_ID Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 11/16] ppc/pnv/pci: Update PHB5 version register Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 12/16] ppc/pnv/pci: Fix PHB xscom registers memory region name Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 13/16] hw/ppc/pegasos2: Fix a typo in a comment Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 14/16] hw/display/sm501: Remove parenthesis around constant macro definitions Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 15/16] hw/display/sm501: Remove unneeded casts from void pointer Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 16/16] hw/display/sm501: Code style fix Daniel Henrique Barboza
2023-02-06 11:37 ` [PULL 00/16] ppc queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230205100449.2352781-3-danielhb413@gmail.com \
    --to=danielhb413@gmail.com \
    --cc=muriloo@linux.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).