From nobody Tue May 13 15:59:16 2025 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.zohomail.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 1538727162022374.2073147486242; Fri, 5 Oct 2018 01:12:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C71480F7B; Fri, 5 Oct 2018 08:12:40 +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 E03AC20155F1; Fri, 5 Oct 2018 08:12:39 +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 914343D393; Fri, 5 Oct 2018 08:12:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w958CAKK009462 for ; Fri, 5 Oct 2018 04:12:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id F20BF2010D5F; Fri, 5 Oct 2018 08:12:09 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E7C1C2010D0C for ; Fri, 5 Oct 2018 08:12:09 +0000 (UTC) Received: from m97138.mail.qiye.163.com (m97138.mail.qiye.163.com [220.181.97.138]) by mx1.redhat.com (Postfix) with ESMTP id 63463C04FF85 for ; Fri, 5 Oct 2018 08:12:07 +0000 (UTC) Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp9 (Coremail) with SMTP id u+CowAB3p3_PHLdb0blTAg--.62652S16; Fri, 05 Oct 2018 16:12:03 +0800 (CST) From: Shi Lei To: libvir-list@redhat.com Date: Fri, 5 Oct 2018 16:11:37 +0800 Message-Id: <20181005081145.29901-15-shi_lei@massclouds.com> In-Reply-To: <20181005081145.29901-1-shi_lei@massclouds.com> References: <20181005081145.29901-1-shi_lei@massclouds.com> X-CM-TRANSID: u+CowAB3p3_PHLdb0blTAg--.62652S16 X-Coremail-Antispam: 1Uf129KBjvJXoWxtF1Uuw17WFyfurW7tF1xAFb_yoWxGrWUpF 4jy3Z0yan8GrsxXa4SkF1DZ3Wjqa48WryUt3s0gw409r45Ars5JFWSgr1vvr4ayr1fZay7 AryYqayxuF13JFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piqg43UUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbigxPWT1sflN4LTQAAsB X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 214 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 05 Oct 2018 08:12:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 05 Oct 2018 08:12:08 +0000 (UTC) for IP:'220.181.97.138' DOMAIN:'m97138.mail.qiye.163.com' HELO:'m97138.mail.qiye.163.com' FROM:'shi_lei@massclouds.com' RCPT:'' X-RedHat-Spam-Score: -0.01 (RCVD_IN_DNSWL_NONE) 220.181.97.138 m97138.mail.qiye.163.com 220.181.97.138 m97138.mail.qiye.163.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.25 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 14/22] uml: Fix misaligned arguments 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.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 05 Oct 2018 08:12:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch fixes misaligned arguments. Signed-off-by: Shi Lei --- src/uml/uml_driver.c | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index d1c71d8..73f1868 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -192,8 +192,8 @@ umlAutostartDomain(virDomainObjPtr vm, } else { virObjectEventPtr event =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_BOOTED); + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED= _BOOTED); virObjectEventStateQueue(data->driver->domainEventState, event= ); } } @@ -342,8 +342,8 @@ umlInotifyEvent(int watch, umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); virDomainAuditStop(dom, "shutdown"); event =3D virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SHUT= DOWN); + VIR_DOMAIN_EVENT_STO= PPED, + VIR_DOMAIN_EVENT_STO= PPED_SHUTDOWN); if (!dom->persistent) virDomainObjListRemove(driver->domains, dom); } else if (e.mask & (IN_CREATE | IN_MODIFY)) { @@ -373,8 +373,8 @@ umlInotifyEvent(int watch, VIR_DOMAIN_SHUTOFF_FAILED); virDomainAuditStop(dom, "failed"); event =3D virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_= FAILED); + VIR_DOMAIN_EVENT= _STOPPED, + VIR_DOMAIN_EVENT= _STOPPED_FAILED); if (!dom->persistent) virDomainObjListRemove(driver->domains, dom); } else if (umlIdentifyChrPTY(driver, dom) < 0) { @@ -383,8 +383,8 @@ umlInotifyEvent(int watch, VIR_DOMAIN_SHUTOFF_FAILED); virDomainAuditStop(dom, "failed"); event =3D virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_= FAILED); + VIR_DOMAIN_EVENT= _STOPPED, + VIR_DOMAIN_EVENT= _STOPPED_FAILED); if (!dom->persistent) virDomainObjListRemove(driver->domains, dom); } @@ -606,8 +606,8 @@ static void umlNotifyLoadDomain(virDomainObjPtr vm, int= newVM, void *opaque) if (newVM) { virObjectEventPtr event =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_DEFINED, - VIR_DOMAIN_EVENT_DEFINED_ADDED); + VIR_DOMAIN_EVENT_DEFINED, + VIR_DOMAIN_EVENT_DEFINED_ADD= ED); virObjectEventStateQueue(driver->domainEventState, event); } } @@ -736,8 +736,8 @@ static int umlProcessAutoDestroyDom(void *payload, umlShutdownVMDaemon(data->driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED); virDomainAuditStop(dom, "destroyed"); event =3D virDomainEventLifecycleNewFromObj(dom, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_DESTROYED); + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DES= TROYED); =20 if (!dom->persistent) virDomainObjListRemove(data->driver->domains, dom); @@ -1154,7 +1154,7 @@ static void umlShutdownVMDaemon(struct uml_driver *dr= iver, =20 if ((ret =3D waitpid(vm->pid, NULL, 0)) !=3D vm->pid) { VIR_WARN("Got unexpected pid %d !=3D %d", - ret, vm->pid); + ret, vm->pid); } =20 vm->pid =3D -1; @@ -1323,7 +1323,7 @@ static int umlGetProcessInfo(unsigned long long *cpuT= ime, pid_t pid) =20 =20 static virDomainPtr umlDomainLookupByID(virConnectPtr conn, - int id) + int id) { struct uml_driver *driver =3D (struct uml_driver *)conn->privateData; virDomainObjPtr vm; @@ -1370,7 +1370,7 @@ static virDomainPtr umlDomainLookupByUUID(virConnectP= tr conn, } =20 static virDomainPtr umlDomainLookupByName(virConnectPtr conn, - const char *name) + const char *name) { struct uml_driver *driver =3D (struct uml_driver *)conn->privateData; virDomainObjPtr vm; @@ -1566,8 +1566,8 @@ static virDomainPtr umlDomainCreateXML(virConnectPtr = conn, const char *xml, } virDomainAuditStart(vm, "booted", true); event =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_BOOTED); + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_BOO= TED); =20 dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 @@ -1639,8 +1639,8 @@ umlDomainDestroyFlags(virDomainPtr dom, umlShutdownVMDaemon(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); virDomainAuditStop(vm, "destroyed"); event =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_DESTROYED); + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DES= TROYED); if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); ret =3D 0; @@ -1758,7 +1758,7 @@ static int umlDomainSetMemory(virDomainPtr dom, unsig= ned long newmem) } =20 static int umlDomainGetInfo(virDomainPtr dom, - virDomainInfoPtr info) + virDomainInfoPtr info) { struct uml_driver *driver =3D dom->conn->privateData; virDomainObjPtr vm; @@ -1901,8 +1901,8 @@ static int umlDomainCreateWithFlags(virDomainPtr dom,= unsigned int flags) virDomainAuditStart(vm, "booted", ret >=3D 0); if (ret =3D=3D 0) event =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_BOOTED); + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED= _BOOTED); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2240,7 +2240,7 @@ umlDomainDetachDeviceFlags(virDomainPtr dom, =20 =20 static int umlDomainGetAutostart(virDomainPtr dom, - int *autostart) + int *autostart) { struct uml_driver *driver =3D dom->conn->privateData; virDomainObjPtr vm; @@ -2263,7 +2263,7 @@ static int umlDomainGetAutostart(virDomainPtr dom, } =20 static int umlDomainSetAutostart(virDomainPtr dom, - int autostart) + int autostart) { struct uml_driver *driver =3D dom->conn->privateData; virDomainObjPtr vm; @@ -2437,7 +2437,7 @@ umlDomainOpenConsole(virDomainPtr dom, =20 if (chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("character device %s is not using a PTY"), + _("character device %s is not using a PTY"), dev_name ? dev_name : NULLSTR(chr->info.alias)); goto cleanup; } --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list