From nobody Tue Feb 10 22:34:07 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.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 1536828943880909.3106724764755; Thu, 13 Sep 2018 01:55:43 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 26F07356E8; Thu, 13 Sep 2018 08:55:41 +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 92A2660BE0; Thu, 13 Sep 2018 08:55:40 +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 1B541181A12F; Thu, 13 Sep 2018 08:55:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8D8tYNd002771 for ; Thu, 13 Sep 2018 04:55:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id AE59F608E6; Thu, 13 Sep 2018 08:55:34 +0000 (UTC) Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A4E33608E0 for ; Thu, 13 Sep 2018 08:55:34 +0000 (UTC) Received: from m97134.mail.qiye.163.com (m97134.mail.qiye.163.com [220.181.97.134]) by mx1.redhat.com (Postfix) with ESMTP id 51E4B300286B for ; Thu, 13 Sep 2018 08:55:30 +0000 (UTC) Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp5 (Coremail) with SMTP id huCowACHxWL+JZpbTfvyAQ--.224S4; Thu, 13 Sep 2018 16:55:28 +0800 (CST) From: Shi Lei To: libvir-list@redhat.com Date: Thu, 13 Sep 2018 16:55:20 +0800 Message-Id: <20180913085524.3520-3-shi_lei@massclouds.com> In-Reply-To: <20180913085524.3520-1-shi_lei@massclouds.com> References: <20180913085524.3520-1-shi_lei@massclouds.com> X-CM-TRANSID: huCowACHxWL+JZpbTfvyAQ--.224S4 X-Coremail-Antispam: 1Uf129KBjvAXoW3tFyrKry5AF13Gr15ZFy8Grg_yoW8WF1xKo Z3Xr42vw4Fg3yUZF4Fkw4xWrZrZasYgFW3Xr45tFWqka1xArWUCr4Ikw13W3yFqFyagrW3 u3W0q3W3WF4xJrs5n29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRNHUDUUUUU X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbifQHAT1rpNlGtYAAAsq X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 212 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 13 Sep 2018 08:55:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 13 Sep 2018 08:55:32 +0000 (UTC) for IP:'220.181.97.134' DOMAIN:'m97134.mail.qiye.163.com' HELO:'m97134.mail.qiye.163.com' FROM:'shi_lei@massclouds.com' RCPT:'' X-RedHat-Spam-Score: -0.01 (RCVD_IN_DNSWL_NONE) 220.181.97.134 m97134.mail.qiye.163.com 220.181.97.134 m97134.mail.qiye.163.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.43 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCHv2 2/6] src: fix incorrect indentation in function body by checking first line 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 13 Sep 2018 08:55:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Shi Lei --- src/bhyve/bhyve_conf.c | 6 +-- src/bhyve/bhyve_driver.c | 32 ++++++------ src/conf/domain_conf.c | 2 +- src/cpu/cpu_s390.c | 84 +++++++++++++++---------------- src/esx/esx_vi_types.c | 2 +- src/qemu/qemu_domain_address.c | 85 ++++++++++++++++---------------- src/util/vircommand.c | 6 +-- src/util/virnetdev.c | 46 ++++++++--------- src/util/virnetdevmacvlan.c | 10 ++-- src/util/virnetdevvportprofile.c | 2 +- src/util/virutil.c | 2 +- src/vbox/vbox_tmpl.c | 8 +-- src/xenconfig/xen_common.c | 10 ++-- 13 files changed, 148 insertions(+), 147 deletions(-) diff --git a/src/bhyve/bhyve_conf.c b/src/bhyve/bhyve_conf.c index 153de7b..60baa2e 100644 --- a/src/bhyve/bhyve_conf.c +++ b/src/bhyve/bhyve_conf.c @@ -36,10 +36,10 @@ static void virBhyveDriverConfigDispose(void *obj); =20 static int virBhyveConfigOnceInit(void) { - if (!VIR_CLASS_NEW(virBhyveDriverConfig, virClassForObject())) - return -1; + if (!VIR_CLASS_NEW(virBhyveDriverConfig, virClassForObject())) + return -1; =20 - return 0; + return 0; } =20 VIR_ONCE_GLOBAL_INIT(virBhyveConfig) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 9284b51..c9f58e1 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -197,27 +197,27 @@ bhyveConnectOpen(virConnectPtr conn, virConfPtr conf ATTRIBUTE_UNUSED, unsigned int flags) { - virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); =20 - if (STRNEQ(conn->uri->path, "/system")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected bhyve URI path '%s', try bhyve:///sy= stem"), - conn->uri->path); - return VIR_DRV_OPEN_ERROR; - } + if (STRNEQ(conn->uri->path, "/system")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected bhyve URI path '%s', try bhyve:///sys= tem"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } =20 - if (bhyve_driver =3D=3D NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("bhyve state driver is not active")); - return VIR_DRV_OPEN_ERROR; - } + if (bhyve_driver =3D=3D NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("bhyve state driver is not active")); + return VIR_DRV_OPEN_ERROR; + } =20 - if (virConnectOpenEnsureACL(conn) < 0) - return VIR_DRV_OPEN_ERROR; + if (virConnectOpenEnsureACL(conn) < 0) + return VIR_DRV_OPEN_ERROR; =20 - conn->privateData =3D bhyve_driver; + conn->privateData =3D bhyve_driver; =20 - return VIR_DRV_OPEN_SUCCESS; + return VIR_DRV_OPEN_SUCCESS; } =20 static int diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 409a229..b08e90e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14430,7 +14430,7 @@ virDomainNVRAMDefParseXML(virDomainXMLOptionPtr xml= opt, xmlNodePtr node, unsigned int flags) { - virDomainNVRAMDefPtr def; + virDomainNVRAMDefPtr def; =20 if (VIR_ALLOC(def) < 0) return NULL; diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index 3d10f92..1abbb58 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -48,50 +48,50 @@ static int virCPUs390Update(virCPUDefPtr guest, const virCPUDef *host) { - virCPUDefPtr updated =3D NULL; - int ret =3D -1; - size_t i; - - if (guest->match =3D=3D VIR_CPU_MATCH_MINIMUM) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("match mode %s not supported"), - virCPUMatchTypeToString(guest->match)); - goto cleanup; - } - - if (guest->mode !=3D VIR_CPU_MODE_HOST_MODEL) { - ret =3D 0; - goto cleanup; - } - - if (!host) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unknown host CPU model")); - goto cleanup; - } - - if (!(updated =3D virCPUDefCopyWithoutModel(guest))) - goto cleanup; - - updated->mode =3D VIR_CPU_MODE_CUSTOM; - if (virCPUDefCopyModel(updated, host, true) < 0) - goto cleanup; - - for (i =3D 0; i < guest->nfeatures; i++) { - if (virCPUDefUpdateFeature(updated, - guest->features[i].name, - guest->features[i].policy) < 0) - goto cleanup; - } - - virCPUDefStealModel(guest, updated, false); - guest->mode =3D VIR_CPU_MODE_CUSTOM; - guest->match =3D VIR_CPU_MATCH_EXACT; - ret =3D 0; + virCPUDefPtr updated =3D NULL; + int ret =3D -1; + size_t i; + + if (guest->match =3D=3D VIR_CPU_MATCH_MINIMUM) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("match mode %s not supported"), + virCPUMatchTypeToString(guest->match)); + goto cleanup; + } + + if (guest->mode !=3D VIR_CPU_MODE_HOST_MODEL) { + ret =3D 0; + goto cleanup; + } + + if (!host) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unknown host CPU model")); + goto cleanup; + } + + if (!(updated =3D virCPUDefCopyWithoutModel(guest))) + goto cleanup; + + updated->mode =3D VIR_CPU_MODE_CUSTOM; + if (virCPUDefCopyModel(updated, host, true) < 0) + goto cleanup; + + for (i =3D 0; i < guest->nfeatures; i++) { + if (virCPUDefUpdateFeature(updated, + guest->features[i].name, + guest->features[i].policy) < 0) + goto cleanup; + } + + virCPUDefStealModel(guest, updated, false); + guest->mode =3D VIR_CPU_MODE_CUSTOM; + guest->match =3D VIR_CPU_MATCH_EXACT; + ret =3D 0; =20 cleanup: - virCPUDefFree(updated); - return ret; + virCPUDefFree(updated); + return ret; } =20 =20 diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 7b234f0..a21a329 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -1781,7 +1781,7 @@ ESX_VI__TEMPLATE__LIST__APPEND(Event) /* esxVI_Event_CastFromAnyType */ ESX_VI__TEMPLATE__DYNAMIC_CAST_FROM_ANY_TYPE(Event, { - case esxVI_Type_Other: + case esxVI_Type_Other: /* Just accept everything here */ break; }) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 24fdf12..8f83ae2 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2301,48 +2301,49 @@ qemuDomainAddressFindNewTargetIndex(virDomainDefPtr= def) static int qemuDomainAddressFindNewBusNr(virDomainDefPtr def) { -/* Try to find a nice default for busNr for a new pci-expander-bus. - * This is a bit tricky, since you need to satisfy the following: - * - * 1) There need to be enough unused bus numbers between busNr of this - * bus and busNr of the next highest bus for the guest to assign a - * unique bus number to each PCI bus that is a child of this - * bus. Each PCI controller. On top of this, the pxb device (which - * implements the pci-expander-bus) includes a pci-bridge within - * it, and that bridge also uses one bus number (so each pxb device - * requires at least 2 bus numbers). - * - * 2) There need to be enough bus numbers *below* this for all the - * child controllers of the pci-expander-bus with the next lower - * busNr (or the pci-root bus if there are no lower - * pci-expander-buses). - * - * 3) If at all possible, we want to avoid needing to change the busNr - * of a bus in the future, as that changes the guest's device ABI, - * which could potentially lead to issues with a guest OS that is - * picky about such things. - * - * Due to the impossibility of predicting what might be added to the - * config in the future, we can't make a foolproof choice, but since - * a pci-expander-bus (pxb) has slots for 32 devices, and the only - * practical use for it is to assign real devices on a particular - * NUMA node in the host, it's reasonably safe to assume it should - * never need any additional child buses (probably only a few of the - * 32 will ever be used). So for pci-expander-bus we find the lowest - * existing busNr, and set this one to the current lowest - 2 (one - * for the pxb, one for the intergrated pci-bridge), thus leaving the - * maximum possible bus numbers available for other buses plugged - * into pci-root (i.e. pci-bridges and other - * pci-expander-buses). Anyone who needs more than 32 devices - * descended from one pci-expander-bus should set the busNr manually - * in the config. - * - * There is room for more error checking here - in particular we - * can/should determine the ultimate parent (root-bus) of each PCI - * controller and determine if there is enough space for all the - * buses within the current range allotted to the bus just prior to - * this one. - */ + /* Try to find a nice default for busNr for a new pci-expander-bus. + * This is a bit tricky, since you need to satisfy the following: + * + * 1) There need to be enough unused bus numbers between busNr of this + * bus and busNr of the next highest bus for the guest to assign a + * unique bus number to each PCI bus that is a child of this + * bus. Each PCI controller. On top of this, the pxb device (which + * implements the pci-expander-bus) includes a pci-bridge within + * it, and that bridge also uses one bus number (so each pxb device + * requires at least 2 bus numbers). + * + * 2) There need to be enough bus numbers *below* this for all the + * child controllers of the pci-expander-bus with the next lower + * busNr (or the pci-root bus if there are no lower + * pci-expander-buses). + * + * 3) If at all possible, we want to avoid needing to change the busNr + * of a bus in the future, as that changes the guest's device ABI, + * which could potentially lead to issues with a guest OS that is + * picky about such things. + * + * Due to the impossibility of predicting what might be added to the + * config in the future, we can't make a foolproof choice, but since + * a pci-expander-bus (pxb) has slots for 32 devices, and the only + * practical use for it is to assign real devices on a particular + * NUMA node in the host, it's reasonably safe to assume it should + * never need any additional child buses (probably only a few of the + * 32 will ever be used). So for pci-expander-bus we find the lowest + * existing busNr, and set this one to the current lowest - 2 (one + * for the pxb, one for the intergrated pci-bridge), thus leaving the + * maximum possible bus numbers available for other buses plugged + * into pci-root (i.e. pci-bridges and other + * pci-expander-buses). Anyone who needs more than 32 devices + * descended from one pci-expander-bus should set the busNr manually + * in the config. + * + * There is room for more error checking here - in particular we + * can/should determine the ultimate parent (root-bus) of each PCI + * controller and determine if there is enough space for all the + * buses within the current range allotted to the bus just prior to + * this one. + */ + size_t i; int lowestBusNr =3D 256; =20 diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 8be3fdf..9a99275 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2872,10 +2872,10 @@ virCommandFree(virCommandPtr cmd) void virCommandDoAsyncIO(virCommandPtr cmd) { - if (!cmd || cmd->has_error) - return; + if (!cmd || cmd->has_error) + return; =20 - cmd->flags |=3D VIR_EXEC_ASYNC_IO | VIR_EXEC_NONBLOCK; + cmd->flags |=3D VIR_EXEC_ASYNC_IO | VIR_EXEC_NONBLOCK; } =20 /** diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index a892251..c30a600 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -295,36 +295,36 @@ virNetDevSetMACInternal(const char *ifname, const virMacAddr *macaddr, bool quiet) { - struct ifreq ifr; - struct sockaddr_dl sdl; - char mac[VIR_MAC_STRING_BUFLEN + 1] =3D ":"; - VIR_AUTOCLOSE s =3D -1; - - if ((s =3D virNetDevSetupControl(ifname, &ifr)) < 0) - return -1; + struct ifreq ifr; + struct sockaddr_dl sdl; + char mac[VIR_MAC_STRING_BUFLEN + 1] =3D ":"; + VIR_AUTOCLOSE s =3D -1; =20 - virMacAddrFormat(macaddr, mac + 1); - sdl.sdl_len =3D sizeof(sdl); - link_addr(mac, &sdl); + if ((s =3D virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; =20 - memcpy(ifr.ifr_addr.sa_data, sdl.sdl_data, VIR_MAC_BUFLEN); - ifr.ifr_addr.sa_len =3D VIR_MAC_BUFLEN; + virMacAddrFormat(macaddr, mac + 1); + sdl.sdl_len =3D sizeof(sdl); + link_addr(mac, &sdl); =20 - if (ioctl(s, SIOCSIFLLADDR, &ifr) < 0) { - if (quiet && - (errno =3D=3D EADDRNOTAVAIL || errno =3D=3D EPERM)) { - VIR_DEBUG("SIOCSIFLLADDR %s MAC=3D%s - Fail", ifname, mac = + 1); - return -1; - } + memcpy(ifr.ifr_addr.sa_data, sdl.sdl_data, VIR_MAC_BUFLEN); + ifr.ifr_addr.sa_len =3D VIR_MAC_BUFLEN; =20 - virReportSystemError(errno, - _("Cannot set interface MAC to %s on '%s'= "), - mac + 1, ifname); + if (ioctl(s, SIOCSIFLLADDR, &ifr) < 0) { + if (quiet && + (errno =3D=3D EADDRNOTAVAIL || errno =3D=3D EPERM)) { + VIR_DEBUG("SIOCSIFLLADDR %s MAC=3D%s - Fail", ifname, mac + 1); return -1; } =20 - VIR_DEBUG("SIOCSIFLLADDR %s MAC=3D%s - Success", ifname, mac + 1); - return 0; + virReportSystemError(errno, + _("Cannot set interface MAC to %s on '%s'"), + mac + 1, ifname); + return -1; + } + + VIR_DEBUG("SIOCSIFLLADDR %s MAC=3D%s - Success", ifname, mac + 1); + return 0; } =20 =20 diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index a66ab59..eff3ef9 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -546,11 +546,11 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr = *hdr, bool *handled, void *opaque) { - struct nla_policy ifla_vf_policy[IFLA_VF_MAX + 1] =3D { - [IFLA_VF_MAC] =3D {.minlen =3D sizeof(struct ifla_vf_mac), - .maxlen =3D sizeof(struct ifla_vf_mac)}, - [IFLA_VF_VLAN] =3D {.minlen =3D sizeof(struct ifla_vf_vlan), - .maxlen =3D sizeof(struct ifla_vf_vlan)}, + struct nla_policy ifla_vf_policy[IFLA_VF_MAX + 1] =3D { + [IFLA_VF_MAC] =3D {.minlen =3D sizeof(struct ifla_vf_mac), + .maxlen =3D sizeof(struct ifla_vf_mac)}, + [IFLA_VF_VLAN] =3D {.minlen =3D sizeof(struct ifla_vf_vlan), + .maxlen =3D sizeof(struct ifla_vf_vlan)}, }; =20 struct nla_policy ifla_port_policy[IFLA_PORT_MAX + 1] =3D { diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprof= ile.c index 3ebf757..215d649 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -451,7 +451,7 @@ int virNetDevVPortProfileMerge3(virNetDevVPortProfilePt= r *result, =20 static struct nla_policy ifla_port_policy[IFLA_PORT_MAX + 1] =3D { - [IFLA_PORT_RESPONSE] =3D { .type =3D NLA_U16 }, + [IFLA_PORT_RESPONSE] =3D { .type =3D NLA_U16 }, }; =20 static uint32_t diff --git a/src/util/virutil.c b/src/util/virutil.c index a908422..2900836 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -940,7 +940,7 @@ char *virGetUserConfigDirectory(void) =20 char *virGetUserCacheDirectory(void) { - return virGetXDGDirectory("XDG_CACHE_HOME", ".cache"); + return virGetXDGDirectory("XDG_CACHE_HOME", ".cache"); } =20 char *virGetUserRuntimeDirectory(void) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 88792c9..53d4fd7 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1253,11 +1253,11 @@ _systemPropertiesGetMaxNetworkAdapters(ISystemPrope= rties *systemProperties, PRUi PRUint32 *maxNetworkAdapters) { #if VBOX_API_VERSION < 4001000 - return systemProperties->vtbl->GetNetworkAdapterCount(systemProper= ties, - maxNetworkAd= apters); + return systemProperties->vtbl->GetNetworkAdapterCount(systemProperties, + maxNetworkAdapte= rs); #else /* VBOX_API_VERSION >=3D 4000000 */ - return systemProperties->vtbl->GetMaxNetworkAdapters(systemPropert= ies, chipset, - maxNetworkAda= pters); + return systemProperties->vtbl->GetMaxNetworkAdapters(systemProperties,= chipset, + maxNetworkAdapter= s); #endif /* VBOX_API_VERSION >=3D 4000000 */ } =20 diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index fdca984..be9e232 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1911,11 +1911,11 @@ xenFormatVif(virConfPtr conf, virDomainDefPtr def, const char *vif_typename) { - virConfValuePtr netVal =3D NULL; - size_t i; - int hvm =3D def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM; + virConfValuePtr netVal =3D NULL; + size_t i; + int hvm =3D def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM; =20 - if (VIR_ALLOC(netVal) < 0) + if (VIR_ALLOC(netVal) < 0) goto cleanup; netVal->type =3D VIR_CONF_LIST; netVal->list =3D NULL; @@ -1923,7 +1923,7 @@ xenFormatVif(virConfPtr conf, for (i =3D 0; i < def->nnets; i++) { if (xenFormatNet(conn, netVal, def->nets[i], hvm, vif_typename) < 0) - goto cleanup; + goto cleanup; } =20 if (netVal->list !=3D NULL) { --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list