提交 46a276b2 编写于 作者: P Peter Krempa

qemu: monitor: Remove qemuMonitorHMPCommand macro

qemuMonitorHMPCommandWithFd is only called via qemuMonitorHMPCommand
macro, so we can remove the macro and the extra unused cruft from the
function.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJiri Denemark <jdenemar@redhat.com>
上级 6acda584
...@@ -1254,10 +1254,9 @@ qemuMonitorUpdateVideoVram64Size(qemuMonitorPtr mon, ...@@ -1254,10 +1254,9 @@ 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;
int ret = -1; int ret = -1;
...@@ -1272,7 +1271,7 @@ qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, ...@@ -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);
......
...@@ -429,12 +429,9 @@ int qemuMonitorUpdateVideoVram64Size(qemuMonitorPtr mon, ...@@ -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,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册