From nobody Thu May 2 05:55:55 2024 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; dkim=fail; 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 15167043793239.726180742565248; Tue, 23 Jan 2018 02:46:19 -0800 (PST) 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 63C1B6014F; Tue, 23 Jan 2018 10:46:17 +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 642C86444E; Tue, 23 Jan 2018 10:46:16 +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 EC1D118033D9; Tue, 23 Jan 2018 10:46:14 +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 w0NAkD52026846 for ; Tue, 23 Jan 2018 05:46:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id 914765D70A; Tue, 23 Jan 2018 10:46:13 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8460D5EDEB for ; Tue, 23 Jan 2018 10:46:09 +0000 (UTC) Received: from m15-112.126.com (m15-112.126.com [220.181.15.112]) by mx1.redhat.com (Postfix) with ESMTP id 4F67287625 for ; Tue, 23 Jan 2018 10:46:06 +0000 (UTC) Received: from localhost.localdomain (unknown [58.213.111.46]) by smtp2 (Coremail) with SMTP id DMmowADX52di52Zaf5ixBA--.1847S2; Tue, 23 Jan 2018 15:42:31 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=oWyY/Kl2HNb4zvxk4j g5VEg/QNvAB9JXTEHNYUcD5H4=; b=bBUhFH3YfTf67QfrrdvEmueLK7nl9ig91k bhHA65zf3xTlD8jcY7wRJkgF8aTg+lMVSjzDm1RWdyIVRj6sJZyGBg3Mfbzb6kjC aqAwART8+SLZiHUw0ptAttxsw8NScSYhfuSj3S8mb/OlD7PELXq8yvwfmJhTSsxX T7boDn5LQ= From: Chen Hanxiao To: libvir-list@redhat.com Date: Tue, 23 Jan 2018 15:40:02 +0800 Message-Id: <20180123074002.19355-1-chen_han_xiao@126.com> X-CM-TRANSID: DMmowADX52di52Zaf5ixBA--.1847S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxGr17Xw4rArW5GF47Kw15Arb_yoWrtF43pF 4DXws5trWkKr1fW3yfG3W7ZFn8G3y8KF9xCFsa93WvvF18J3sFqw1xWw409Fyjyr4fZFy2 kr9FgayUuF4DXFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UC0PfUUUUU= X-Originating-IP: [58.213.111.46] X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbikgPWrlpD4Cnv-QABsq X-Greylist: Delayed for 03:03:32 by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 23 Jan 2018 10:46:07 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 23 Jan 2018 10:46:07 +0000 (UTC) for IP:'220.181.15.112' DOMAIN:'m15-112.126.com' HELO:'m15-112.126.com' FROM:'chen_han_xiao@126.com' RCPT:'' X-RedHat-Blacklist-Warning: Relay 220.181.15.112 is blacklisted by a RBL system X-RedHat-Spam-Score: 2 ** (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_PSBL, RCVD_IN_SBL_CSS, SPF_PASS, T_RP_MATCHES_RCVD) 220.181.15.112 m15-112.126.com 220.181.15.112 m15-112.126.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Chen Hanxiao Subject: [libvirt] [PATCH] qemu: get VM's ip address from the output of arp command 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.25]); Tue, 23 Jan 2018 10:46:18 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Chen Hanxiao Introduce VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP to get ip address of VM from the output of `arp -an` command. We can use: domifaddr f26-cloud --source arp to get the address. Signed-off-by: Chen Hanxiao --- include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 102 +++++++++++++++++++++++++++++++++++= ++++ tools/virsh-domain-monitor.c | 2 + 3 files changed, 105 insertions(+) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-dom= ain.h index 4048acf38..38e2d9a3e 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4665,6 +4665,7 @@ typedef virMemoryParameter *virMemoryParameterPtr; typedef enum { VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE =3D 0, /* Parse DHCP lease fi= le */ VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT =3D 1, /* Query qemu guest ag= ent */ + VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP =3D 2, /* Query ARP tables */ =20 # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LAST diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a203c9297..5aaf69442 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -160,6 +160,9 @@ static int qemuGetDHCPInterfaces(virDomainPtr dom, virDomainObjPtr vm, virDomainInterfacePtr **ifaces); =20 +static int qemuARPGetInterfaces(virDomainObjPtr vm, + virDomainInterfacePtr **ifaces); + static virQEMUDriverPtr qemu_driver; =20 =20 @@ -20384,6 +20387,10 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, =20 break; =20 + case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP: + ret =3D qemuARPGetInterfaces(vm, ifaces); + break; + default: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("Unknown IP address data source %d"), @@ -20494,6 +20501,101 @@ qemuGetDHCPInterfaces(virDomainPtr dom, } =20 =20 +static int +qemuARPGetInterfaces(virDomainObjPtr vm, + virDomainInterfacePtr **ifaces) +{ + size_t i, j; + size_t ifaces_count =3D 0; + int ret =3D -1; + char macaddr[VIR_MAC_STRING_BUFLEN]; + virDomainInterfacePtr *ifaces_ret =3D NULL; + virDomainInterfacePtr iface =3D NULL; + virCommandPtr cmd =3D NULL; + char *outbuf; + char **lines =3D NULL; + char **matches =3D NULL; +#define ARP_CMD "/usr/sbin/arp" + + if (!(cmd =3D virCommandNewArgList(ARP_CMD, + "-an", + NULL))) + goto cleanup; + + virCommandSetOutputBuffer(cmd, &outbuf); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + lines =3D virStringSplit(outbuf, "\n", 0); + if (lines =3D=3D NULL) + goto cleanup; + + for (i =3D 0; i < vm->def->nnets; i++) { + if (vm->def->nets[i]->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + + if (strstr(outbuf, macaddr)) { + for (j =3D 0; lines[j]; j++) { + const char *line =3D lines[j]; + if (line =3D=3D NULL) + break; + if (strstr(line, macaddr) && + virStringSearch(line, "\\b([0-9]{1,3}\\.){3}[0-9]{1,3}= \\b", + 1, &matches) =3D=3D 1) { + + if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) + goto error; + + if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0) + goto error; + + iface =3D ifaces_ret[ifaces_count - 1]; + iface->naddrs =3D 1; + if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) + goto error; + + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) = < 0) + goto cleanup; + + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) + goto cleanup; + + if (VIR_STRDUP(iface->addrs->addr, matches[0]) < 0) + goto cleanup; + } + } + } else { + VIR_DEBUG("Got nothing"); + continue; + } + } + + *ifaces =3D ifaces_ret; + ifaces_ret =3D NULL; + ret =3D ifaces_count; + + cleanup: + virCommandFree(cmd); + VIR_FREE(outbuf); + virStringListFree(lines); + virStringListFree(matches); + cmd =3D NULL; + return ret; + + error: + if (ifaces_ret) { + for (i =3D 0; i < ifaces_count; i++) + virDomainInterfaceFree(ifaces_ret[i]); + } + VIR_FREE(ifaces_ret); + + goto cleanup; +} + + static int qemuDomainSetUserPassword(virDomainPtr dom, const char *user, diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 32a42707e..68da11ed5 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2190,6 +2190,8 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) source =3D VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE; } else if (STREQ(sourcestr, "agent")) { source =3D VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT; + } else if (STREQ(sourcestr, "arp")) { + source =3D VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP; } else { vshError(ctl, _("Unknown data source '%s'"), sourcestr); goto cleanup; --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list