From patchwork Tue Jun 19 16:40:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 139223 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5428489lji; Tue, 19 Jun 2018 09:41:19 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLl295I87Fs/AsS215NuvJiqjSmNRucg3M8hocBjAgKOIWnAoQki6w1aXcx9dPQf9wVfVjA X-Received: by 2002:a9d:443:: with SMTP id 61-v6mr10241271otc.285.1529426479824; Tue, 19 Jun 2018 09:41:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529426479; cv=none; d=google.com; s=arc-20160816; b=GbdzQGiCDufIoABTBgEs7goQfHffTmkmFi1tsJsoiUs5bRClFADhryiqurcc+VO0RU dISAz7m/7GzT9s5cvoKq608fy09Oqw1GuVozy6EWSuzFT/7n8jM9zn50JITWzRvt6tdF jeq8wriWslErKibS6YczOgrilUm7WlhxwOBJkN6PQiPsUoJMYCmXbrUKPMrxZBCNjvG2 GpJMoJJsy4qHBbzNgYxXHVIaNXuxQA5C8FiP1WaSKnaiiS9hoYc+8EgYVk8+hfwwOjEw cexAQuzVyjn4B1HgHPg7BYeYfxZP0EMa+HWvMXRk6b9t9yQHlanvMOGQRn2Vixwjzus+ S6aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=zyBKLY/fXyWRB3kdVIVhSJwk+aMOfzlDF0Dhs6JcH1E=; b=lDj1OJsAk70gbxKTMOQk3bRjxH4EPbXmejCpOSSMwDDrdD0rUEKFenSGHW249TJNS7 UCO7jKcJ3zNV7E80aAg1sD/yEt4YOpYaqWp5ubypiFfV+/SUBMwE+crTkYCmlUE7n0yn yFgJIWrOnQvQFGMzuvbsLwRczUipM49z87IvkhZkJzJ5oUw05rnO9Ce/AMeX4LcrJZgU qe4zK7CUoaivVS0R5CC9BosZhY1RrEq9H4OhS1XbG9ehjH/CTEXijQa8A/2By72A9SOz Yg+VTfSyxV0tvVAUR/QlUBJ5DgGQXfMlh8G9rifXVEXt1Xc8C5na8ucXS3i4k8Mrut2w 4zGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id w16-v6si36110oie.255.2018.06.19.09.41.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jun 2018 09:41:19 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 294DE308FB8B; Tue, 19 Jun 2018 16:41:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7F6E600C0; Tue, 19 Jun 2018 16:41:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id AD6444A464; Tue, 19 Jun 2018 16:41:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5JGfERE011280 for ; Tue, 19 Jun 2018 12:41:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1DF0E2018076; Tue, 19 Jun 2018 16:41:14 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.bos.redhat.com (dhcp-17-157.bos.redhat.com [10.18.17.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03DA32026D68; Tue, 19 Jun 2018 16:41:13 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 19 Jun 2018 12:40:48 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/6] qemu: command: Rename BuildNicStr to BuildLegacyNicStr X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 19 Jun 2018 16:41:18 +0000 (UTC) Makes it less ambiguous Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4625851dc5..f7038a8c5e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3353,9 +3353,9 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem) static char * -qemuBuildNicStr(virDomainNetDefPtr net, - const char *prefix, - int vlan) +qemuBuildLegacyNicStr(virDomainNetDefPtr net, + const char *prefix, + int vlan) { char *str; char macaddr[VIR_MAC_STRING_BUFLEN]; @@ -8517,7 +8517,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); } else { - if (!(nic = qemuBuildNicStr(net, "nic,", vlan))) + if (!(nic = qemuBuildLegacyNicStr(net, "nic,", vlan))) goto cleanup; virCommandAddArgList(cmd, "-net", nic, NULL);