From patchwork Fri Jan 8 03:50:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 59322 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp311177lbb; Thu, 7 Jan 2016 19:53:34 -0800 (PST) X-Received: by 10.140.139.71 with SMTP id 68mr131015561qhl.51.1452225205682; Thu, 07 Jan 2016 19:53:25 -0800 (PST) Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com. [209.132.183.39]) by mx.google.com with ESMTPS id e64si86964377qgf.1.2016.01.07.19.53.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jan 2016 19:53:25 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u083oxWx013011; Thu, 7 Jan 2016 22:50:59 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u083oGes005732 for ; Thu, 7 Jan 2016 22:50:16 -0500 Received: from colepc.redhat.com (ovpn-113-33.phx2.redhat.com [10.3.113.33]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u083oBtb030219; Thu, 7 Jan 2016 22:50:16 -0500 From: Cole Robinson To: libvirt-list@redhat.com Date: Thu, 7 Jan 2016 22:50:00 -0500 Message-Id: <9a7ec47841804bd157c480ff75a24bcc0cf02fea.1452224621.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/12] qemu: Handle CanonicalizeMachine in post parse 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 Rather than open coding calls. I can't see any reason not to --- src/qemu/qemu_domain.c | 23 +++++++++++++++++++++++ src/qemu/qemu_driver.c | 29 ----------------------------- 2 files changed, 23 insertions(+), 29 deletions(-) -- 2.5.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 26a29b1..48a2160 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1199,6 +1199,26 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, static int +qemuCanonicalizeMachine(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) +{ + const char *canon; + + if (!(canon = virQEMUCapsGetCanonicalMachine(qemuCaps, def->os.machine))) + return 0; + + if (STRNEQ(canon, def->os.machine)) { + char *tmp; + if (VIR_STRDUP(tmp, canon) < 0) + return -1; + VIR_FREE(def->os.machine); + def->os.machine = tmp; + } + + return 0; +} + + +static int qemuDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps, void *opaque) @@ -1223,6 +1243,9 @@ qemuDomainDefPostParse(virDomainDefPtr def, if (qemuDomainDefAddDefaultDevices(def, qemuCaps) < 0) goto cleanup; + if (qemuCanonicalizeMachine(def, qemuCaps) < 0) + goto cleanup; + ret = 0; cleanup: virObjectUnref(qemuCaps); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 51c6950..50ce514 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1684,26 +1684,6 @@ static int qemuConnectNumOfDomains(virConnectPtr conn) } -static int -qemuCanonicalizeMachine(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) -{ - const char *canon; - - if (!(canon = virQEMUCapsGetCanonicalMachine(qemuCaps, def->os.machine))) - return 0; - - if (STRNEQ(canon, def->os.machine)) { - char *tmp; - if (VIR_STRDUP(tmp, canon) < 0) - return -1; - VIR_FREE(def->os.machine); - def->os.machine = tmp; - } - - return 0; -} - - static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, const char *xml, unsigned int flags) @@ -1749,9 +1729,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator))) goto cleanup; - if (qemuCanonicalizeMachine(def, qemuCaps) < 0) - goto cleanup; - if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0) goto cleanup; @@ -7531,9 +7508,6 @@ static virDomainPtr qemuDomainDefineXMLFlags(virConnectPtr conn, const char *xml if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator))) goto cleanup; - if (qemuCanonicalizeMachine(def, qemuCaps) < 0) - goto cleanup; - if (qemuDomainAssignAddresses(def, qemuCaps, NULL) < 0) goto cleanup; @@ -15888,9 +15862,6 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator))) goto cleanup; - if (qemuCanonicalizeMachine(def, qemuCaps) < 0) - goto cleanup; - if (qemuAssignDeviceAliases(def, qemuCaps) < 0) goto cleanup;