From patchwork Tue Jun 19 16:40:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 139228 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5428813lji; Tue, 19 Jun 2018 09:41:35 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL/igcUmoaY+llmkqA9eozMUbeyzzdI1gg9TYREpKn8OEQSgtdnSmiYtSQWIxldxCJXof8U X-Received: by 2002:a9d:2466:: with SMTP id p93-v6mr10257355ota.98.1529426495629; Tue, 19 Jun 2018 09:41:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529426495; cv=none; d=google.com; s=arc-20160816; b=F861P7L7WcA55y65wP8GT9jynr/N0uj+xC/GcCa+POL2NXm8zR/DsqcRxm4PYhbjt9 Cv0veJ2O1rPN3JZKCcI4P7EtgNbD1qfBlHAUdRL1TcV6fjONqnHa3lzjoWPZOkxJEyE+ m1Xidw+j4cKF2A1NWGd2KAj2/5NHx3yThtxfioTJlIn29NJpsUiE8R2bTxdAad4oY7XA bgTxr/FLq+RYped5HWv4ODTXRtOOtR68v1H5oc0bgcpqyyU4d2hleJ0U03LrP4dY9E6n hixJeeVBFQ+Q58hq8n99ne/gD6INuXZEV5o8ymPJEU2cFRPVmIEnIOK36Gql9l6vBXeS Tauw== 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=WYB/aBSoatwM76L0H1kGyp3PrvG/efuWWFhGt151O80=; b=z6eZTZmfXels0E6cAosg0mERSohFP6jbdbLSliCsDfDsocF5109L3G9jvTq+XlB/ZO ZMCuBoKZtbNigDzpatusQSJotVyPPVpiWe8c2gXQouQ++sueMtAPladAqZvj2XEZwGsj MA9Sqr83sOHaE3CGddR94xhzSb7Bpkz9Gv3Oy8zeU4gwGH/opiLsLksBMibWm+iOQW+L Ld2uKQSh6yeH4AV8M12vik4gq19/z5WmTqGqpohOnPw50fuEcg/LVarRfvzZqsFbTu4Z GH5d8JJ8FznAtO/X1l70PeHJ6hv0Tp59AP63lrv4apT+smOd7Hq6h/X9nPC2RRaOebsC 1VYg== 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 f127-v6si38017oic.302.2018.06.19.09.41.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jun 2018 09:41:35 -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-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4D0C4356DE; Tue, 19 Jun 2018 16:41:34 +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 21DB0308332C; Tue, 19 Jun 2018 16:41:34 +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 BAE7E41091; Tue, 19 Jun 2018 16:41:33 +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 w5JGfEXd011290 for ; Tue, 19 Jun 2018 12:41:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 42D002018061; 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 290622026D68; Tue, 19 Jun 2018 16:41:14 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Tue, 19 Jun 2018 12:40:49 -0400 Message-Id: <439f1d8e3e1e6ff7e5ac3e71931e27c24e4acaf3.1529426092.git.crobinso@redhat.com> 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 3/6] qemu: command: remove unused LegacyNicStr arg 'prefix' 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.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 19 Jun 2018 16:41:34 +0000 (UTC) Hardcode the only string that's passed in Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 6 ++---- 1 file changed, 2 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 f7038a8c5e..31a0b7761a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3354,15 +3354,13 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem) static char * qemuBuildLegacyNicStr(virDomainNetDefPtr net, - const char *prefix, int vlan) { char *str; char macaddr[VIR_MAC_STRING_BUFLEN]; ignore_value(virAsprintf(&str, - "%smacaddr=%s,vlan=%d%s%s%s%s", - prefix ? prefix : "", + "nic,macaddr=%s,vlan=%d%s%s%s%s", virMacAddrFormat(&net->mac, macaddr), vlan, (net->model ? ",model=" : ""), @@ -8517,7 +8515,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); } else { - if (!(nic = qemuBuildLegacyNicStr(net, "nic,", vlan))) + if (!(nic = qemuBuildLegacyNicStr(net, vlan))) goto cleanup; virCommandAddArgList(cmd, "-net", nic, NULL);