]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Remove redundant arguments to qemuBuildSerialChrDeviceStr()
authorAndrea Bolognani <abologna@redhat.com>
Thu, 23 Jun 2016 08:07:44 +0000 (10:07 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Fri, 24 Jun 2016 08:17:59 +0000 (10:17 +0200)
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

index 4fdb410e7660b7b55d00c5bfc4abb1918f4fcad2..64b3664a9835e7de6b7426a029a859cdc44cfd6f 100644 (file)
@@ -9396,13 +9396,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",
@@ -9577,9 +9575,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: