[PATCH 1/4] qemu: Remove redundant arguments to qemuBuildSerialChrDeviceStr()

[Andrea Bolognani <abologna@xxxxxxxxxx>]

Since we're already passing the full virDomainDef, it doesn't
make sense to also pass def->os.arch and def->os.machine as
separate arguments.
---
 src/qemu/qemu_command.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6944129..030d84b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9388,13 +9388,11 @@ static int
 qemuBuildSerialChrDeviceStr(char **deviceStr,
                             const virDomainDef *def,
                             virDomainChrDefPtr serial,
-                            virQEMUCapsPtr qemuCaps,
-                            virArch arch,
-                            char *machine)
+                            virQEMUCapsPtr qemuCaps)
 {
     virBuffer cmd = VIR_BUFFER_INITIALIZER;
 
-    if (ARCH_IS_PPC64(arch) && STRPREFIX(machine, "pseries")) {
+    if (ARCH_IS_PPC64(def->os.arch) && STRPREFIX(def->os.machine, "pseries")) {
         if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
             serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {
             virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s",
@@ -9569,9 +9567,7 @@ qemuBuildChrDeviceStr(char **deviceStr,
 
     switch ((virDomainChrDeviceType) chr->deviceType) {
     case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
-        ret = qemuBuildSerialChrDeviceStr(deviceStr, vmdef, chr, qemuCaps,
-                                          vmdef->os.arch,
-                                          vmdef->os.machine);
+        ret = qemuBuildSerialChrDeviceStr(deviceStr, vmdef, chr, qemuCaps);
         break;
 
     case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
-- 
2.7.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list