From nobody Sat Feb 7 09:30:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491572674060479.80331782928624; Fri, 7 Apr 2017 06:44:34 -0700 (PDT) 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 736076AAE6; Fri, 7 Apr 2017 13:44:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 40B7F88664; Fri, 7 Apr 2017 13:44:32 +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 E091118521CA; Fri, 7 Apr 2017 13:44:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37DiTHO027099 for ; Fri, 7 Apr 2017 09:44:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id C9B23B11FC; Fri, 7 Apr 2017 13:44:29 +0000 (UTC) Received: from antique-work.brq.redhat.com (dhcp129-230.brq.redhat.com [10.34.129.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43945A63C1 for ; Fri, 7 Apr 2017 13:44:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 736076AAE6 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 736076AAE6 From: Pavel Hrdina To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 15:44:16 +0200 Message-Id: <6254ff58f50c7f0ccb6951841d5951cfdfd2421a.1491572622.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/8] tests/qemuxml2argvtest: remove unnecessary machine canonicalization 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 Content-Transfer-Encoding: quoted-printable 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.26]); Fri, 07 Apr 2017 13:44:33 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is not required to run our tests. Signed-off-by: Pavel Hrdina --- tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args | 2 +- tests/qemuxml2argvtest.c | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args b/te= sts/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args index 90c2555ce1..eacf9c224f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ -name dummy2 \ -S \ --M pc-0.11 \ +-M pc \ -m 128 \ -smp 2,maxcpus=3D6,sockets=3D6,cores=3D1,threads=3D1 \ -object iothread,id=3Diothread1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/te= sts/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args index 5e2d0c0633..78d9539137 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --M pc-0.11 \ +-M pc \ -m 214 \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0b26cd5c7c..18ff5ad147 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -474,13 +474,6 @@ testCompareXMLToArgv(const void *data) if (qemuProcessPrepareMonitorChr(&monitor_chr, priv->libDir) < 0) goto cleanup; =20 - if (STREQ(vm->def->os.machine, "pc") && - STREQ(vm->def->emulator, "/usr/bin/qemu-system-x86_64")) { - VIR_FREE(vm->def->os.machine); - if (VIR_STRDUP(vm->def->os.machine, "pc-0.11") < 0) - goto cleanup; - } - if (testUpdateQEMUCaps(info, vm, driver.caps) < 0) goto cleanup; =20 --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list