From 0969b5051bb7ea4638d236e53944ca5dd92707ed Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Thu, 23 Jun 2016 10:07:44 +0200 Subject: [PATCH] qemu: Remove redundant arguments to qemuBuildSerialChrDeviceStr() 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 4fdb410e76..64b3664a98 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -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: -- GitLab