External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: monitor: Remove qemuMonitorHMPCommand macro

Browse Source 
qemuMonitorHMPCommandWithFd is only called via qemuMonitorHMPCommand
macro, so we can remove the macro and the extra unused cruft from the
function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Peter Krempa 2019-09-19 16:51:54 +02:00
parent 6acda58495
commit 46a276b277
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_monitor.c
View File

@ -1254,9 +1254,8 @@ qemuMonitorUpdateVideoVram64Size(qemuMonitorPtr mon,
int int
qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, qemuMonitorHMPCommand(qemuMonitorPtr mon,
const char *cmd, const char *cmd,
int scm_fd,
char **reply) char **reply)
{ {
char *json_cmd = NULL; char *json_cmd = NULL;
@ -1272,7 +1271,7 @@ qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon,
_("Unable to unescape command")); _("Unable to unescape command"));
goto cleanup; goto cleanup;
} }
ret = qemuMonitorJSONHumanCommandWithFd(mon, json_cmd, scm_fd, reply); ret = qemuMonitorJSONHumanCommandWithFd(mon, json_cmd, -1, reply);
cleanup: cleanup:
VIR_FREE(json_cmd); VIR_FREE(json_cmd);

5
src/qemu/qemu_monitor.h
View File

@ -429,12 +429,9 @@ int qemuMonitorUpdateVideoVram64Size(qemuMonitorPtr mon,
virDomainVideoDefPtr video, virDomainVideoDefPtr video,
const char *videoName) const char *videoName)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, int qemuMonitorHMPCommand(qemuMonitorPtr mon,
const char *cmd, const char *cmd,
int scm_fd,
char **reply); char **reply);
#define qemuMonitorHMPCommand(mon, cmd, reply) \
qemuMonitorHMPCommandWithFd(mon, cmd, -1, reply)
int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event,
long long seconds, unsigned int micros, long long seconds, unsigned int micros,