9:25 p.m.
This serie adds a new function into QEMU Guest Agent handlers to use
the QEMU command 'guest-get-host-name' to retrieve the domain hostname.
This approach requires QEMU-GA running inside the guest, but it is the
fastest and easiest way to get this info.
Julio Faracco (2):
qemu: implementing qemuAgentGetHostname() function.
qemu: adding domainGetHostname support for QEMU.
src/qemu/qemu_agent.c | 39 +++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_agent.h | 4 ++++
src/qemu/qemu_driver.c | 41 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 84 insertions(+)
--
2.17.1
9:25 p.m.
New subject: [libvirt] [PATCH 1/2] qemu: implementing qemuAgentGetHostname() function.
This commit implements the function qemuAgentGetHostname() that uses the
QEMU command 'guest-get-host-name' to retrieve the guest hostname of
Virtual Machine. It is a possibility where QEMU-GA is running.
Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
---
src/qemu/qemu_agent.c | 39 +++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_agent.h | 4 ++++
2 files changed, 43 insertions(+)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index bf08871f18..2c7f98378e 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1682,6 +1682,45 @@ qemuAgentUpdateCPUInfo(unsigned int nvcpus,
return 0;
}
+int
+qemuAgentGetHostname(qemuAgentPtr mon,
+ char **hostname)
+{
+ int ret = -1;
+ virJSONValuePtr cmd;
+ virJSONValuePtr reply = NULL;
+ virJSONValuePtr data = NULL;
+
+ cmd = qemuAgentMakeCommand("guest-get-host-name",
+ NULL);
+
+ if (!cmd)
+ return ret;
+
+ if (qemuAgentCommand(mon, cmd, &reply, true,
+ VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
+ goto cleanup;
+
+ if (!(data = virJSONValueObjectGet(reply, "return"))) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("malformed return value"));
+ goto cleanup;
+ }
+
+ if (VIR_STRDUP(*hostname,
+ virJSONValueObjectGetString(data, "host-name")) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("'host-name' missing in reply of
guest-get-host-name"));
+ goto cleanup;
+ }
+
+ ret = 0;
+
+ cleanup:
+ virJSONValueFree(cmd);
+ virJSONValueFree(reply);
+ return ret;
+}
int
qemuAgentGetTime(qemuAgentPtr mon,
diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h
index 6dd9c702dd..4354b7e0cf 100644
--- a/src/qemu/qemu_agent.h
+++ b/src/qemu/qemu_agent.h
@@ -105,6 +105,10 @@ int qemuAgentUpdateCPUInfo(unsigned int nvcpus,
qemuAgentCPUInfoPtr cpuinfo,
int ncpuinfo);
+int
+qemuAgentGetHostname(qemuAgentPtr mon,
+ char **hostname);
+
int qemuAgentGetTime(qemuAgentPtr mon,
long long *seconds,
unsigned int *nseconds);
--
2.17.1
7:24 a.m.
New subject: [libvirt] [PATCH 1/2] qemu: implementing qemuAgentGetHostname() function.
On Fri, Aug 17, 2018 at 23:25:18 -0300, Julio Faracco wrote:
This commit implements the function qemuAgentGetHostname() that uses
the
QEMU command 'guest-get-host-name' to retrieve the guest hostname of
Virtual Machine. It is a possibility where QEMU-GA is running.
Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
---
src/qemu/qemu_agent.c | 39 +++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_agent.h | 4 ++++
2 files changed, 43 insertions(+)
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index bf08871f18..2c7f98378e 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1682,6 +1682,45 @@ qemuAgentUpdateCPUInfo(unsigned int nvcpus,
return 0;
}
+int
+qemuAgentGetHostname(qemuAgentPtr mon,
+ char **hostname)
+{
+ int ret = -1;
+ virJSONValuePtr cmd;
+ virJSONValuePtr reply = NULL;
+ virJSONValuePtr data = NULL;
+
+ cmd = qemuAgentMakeCommand("guest-get-host-name",
+ NULL);
+
+ if (!cmd)
+ return ret;
+
+ if (qemuAgentCommand(mon, cmd, &reply, true,
+ VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
+ goto cleanup;
+
+ if (!(data = virJSONValueObjectGet(reply, "return"))) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("malformed return value"));
does the GA report errors? If yes the 'return' object will not be
present but the error, where there might be more data than this.
+ goto cleanup;
+ }
+
+ if (VIR_STRDUP(*hostname,
+ virJSONValueObjectGetString(data, "host-name")) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("'host-name' missing in reply of
guest-get-host-name"));
This is wrong. VIR_STRDUP returns 0 if the 'src' argument was NULL. So
this would effectively report the error only on OOM error where
VIR_STRDUP reports it's own error.
+ goto cleanup;
+ }
9:25 p.m.
New subject: [libvirt] [PATCH 2/2] qemu: adding domainGetHostname support for QEMU.
This commit add the support to use the function qemuAgentGetHostname() for
obtain the domain hostname using QEMU-GA command.
Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
---
src/qemu/qemu_driver.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d4a2379e48..9a6614fbc2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19309,6 +19309,46 @@ qemuConnectGetCPUModelNames(virConnectPtr conn,
return virCPUGetModels(arch, models);
}
+static char *
+qemuDomainGetHostname(virDomainPtr dom,
+ unsigned int flags)
+{
+ int rv = -1;
+ virQEMUDriverPtr driver = dom->conn->privateData;
+ virDomainObjPtr vm = NULL;
+ qemuAgentPtr agent;
+ char *hostname = NULL;
+
+ virCheckFlags(0, hostname);
+
+ if (!(vm = qemuDomObjFromDomain(dom)))
+ return NULL;
+
+ if (virDomainGetTimeEnsureACL(dom->conn, vm->def) < 0)
+ goto cleanup;
+
+ if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0)
+ goto cleanup;
+
+ if (virDomainObjCheckActive(vm) < 0)
+ goto endjob;
+
+ if (!qemuDomainAgentAvailable(vm, true))
+ goto endjob;
+
+ agent = qemuDomainObjEnterAgent(vm);
+ rv = qemuAgentGetHostname(agent, &hostname);
+ qemuDomainObjExitAgent(vm, agent);
+
+ endjob:
+ qemuDomainObjEndAgentJob(vm);
+
+ cleanup:
+ virDomainObjEndAPI(&vm);
+ return hostname;
+}
+
+
static int
qemuDomainGetTime(virDomainPtr dom,
long long *seconds,
@@ -21787,6 +21827,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
.connectGetCPUModelNames = qemuConnectGetCPUModelNames, /* 1.1.3 */
.domainFSFreeze = qemuDomainFSFreeze, /* 1.2.5 */
.domainFSThaw = qemuDomainFSThaw, /* 1.2.5 */
+ .domainGetHostname = qemuDomainGetHostname, /* 4.6.0 */
.domainGetTime = qemuDomainGetTime, /* 1.2.5 */
.domainSetTime = qemuDomainSetTime, /* 1.2.5 */
.nodeGetFreePages = qemuNodeGetFreePages, /* 1.2.6 */
--
2.17.1
7:18 a.m.
New subject: [libvirt] [PATCH 2/2] qemu: adding domainGetHostname support for QEMU.
On Fri, Aug 17, 2018 at 23:25:19 -0300, Julio Faracco wrote:
This commit add the support to use the function
qemuAgentGetHostname() for
obtain the domain hostname using QEMU-GA command.
Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
---
src/qemu/qemu_driver.c | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d4a2379e48..9a6614fbc2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19309,6 +19309,46 @@ qemuConnectGetCPUModelNames(virConnectPtr conn,
return virCPUGetModels(arch, models);
}
+static char *
+qemuDomainGetHostname(virDomainPtr dom,
+ unsigned int flags)
+{
+ int rv = -1;
+ virQEMUDriverPtr driver = dom->conn->privateData;
+ virDomainObjPtr vm = NULL;
+ qemuAgentPtr agent;
+ char *hostname = NULL;
+
+ virCheckFlags(0, hostname);
Please return NULL directly.
+
+ if (!(vm = qemuDomObjFromDomain(dom)))
+ return NULL;
+
+ if (virDomainGetTimeEnsureACL(dom->conn, vm->def) < 0)
ACL checking functions are per-API, so this should use virDomainGetHostnameACL.
I presume it's a copy-paste error.
This is the wrong ACL checking function.
+ goto cleanup;
+
+ if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0)
+ goto cleanup;
+
+ if (virDomainObjCheckActive(vm) < 0)
+ goto endjob;
+
+ if (!qemuDomainAgentAvailable(vm, true))
+ goto endjob;
+
+ agent = qemuDomainObjEnterAgent(vm);
+ rv = qemuAgentGetHostname(agent, &hostname);
rv is unused. Either make sure it's used somehow or use the
'ignore_value()' wrapper instead.
+ qemuDomainObjExitAgent(vm, agent);
+
+ endjob:
+ qemuDomainObjEndAgentJob(vm);
+
+ cleanup:
+ virDomainObjEndAPI(&vm);
+ return hostname;
+}
+
+
static int
qemuDomainGetTime(virDomainPtr dom,
long long *seconds,
@@ -21787,6 +21827,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
.connectGetCPUModelNames = qemuConnectGetCPUModelNames, /* 1.1.3 */
.domainFSFreeze = qemuDomainFSFreeze, /* 1.2.5 */
.domainFSThaw = qemuDomainFSThaw, /* 1.2.5 */
+ .domainGetHostname = qemuDomainGetHostname, /* 4.6.0 */
.domainGetTime = qemuDomainGetTime, /* 1.2.5 */
.domainSetTime = qemuDomainSetTime, /* 1.2.5 */
.nodeGetFreePages = qemuNodeGetFreePages, /* 1.2.6 */
--
2.17.1
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
3:59 a.m.
New subject: [libvirt] [PATCH 2/2] qemu: adding domainGetHostname support for QEMU.
On Sat, Aug 18, 2018 at 02:18:17PM +0200, Peter Krempa wrote:
On Fri, Aug 17, 2018 at 23:25:19 -0300, Julio Faracco wrote:
> This commit add the support to use the function qemuAgentGetHostname() for
> obtain the domain hostname using QEMU-GA command.
>
> Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
> ---
> src/qemu/qemu_driver.c | 41 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 41 insertions(+)
>
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index d4a2379e48..9a6614fbc2 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -19309,6 +19309,46 @@ qemuConnectGetCPUModelNames(virConnectPtr conn,
> return virCPUGetModels(arch, models);
> }
>
> +static char *
> +qemuDomainGetHostname(virDomainPtr dom,
> + unsigned int flags)
> +{
> + int rv = -1;
> + virQEMUDriverPtr driver = dom->conn->privateData;
> + virDomainObjPtr vm = NULL;
> + qemuAgentPtr agent;
> + char *hostname = NULL;
> +
> + virCheckFlags(0, hostname);
Please return NULL directly.
> +
> + if (!(vm = qemuDomObjFromDomain(dom)))
> + return NULL;
> +
> + if (virDomainGetTimeEnsureACL(dom->conn, vm->def) < 0)
ACL checking functions are per-API, so this should use virDomainGetHostnameACL.
I presume it's a copy-paste error.
This is the wrong ACL checking function.
'make check' should have reported this, so make sure to run that.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
2286
days inactive
2288
days old
5 comments
3 participants
participants (3)
-
Daniel P. Berrangé -
Julio Faracco -
Peter Krempa