提交 d766021c 编写于 作者: P Peter Krempa

qemu: Delete old unused code for adding objects to qemu

Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 805da1d5
......@@ -2602,7 +2602,6 @@ virQEMUBuildCommandLineJSONArrayBitmap;
virQEMUBuildCommandLineJSONArrayNumbered;
virQEMUBuildDriveCommandlineFromJSON;
virQEMUBuildObjectCommandlineFromJSON;
virQEMUBuildObjectCommandlineFromJSONType;
virQEMUBuildQemuImgKeySecretOpts;
......
......@@ -3093,40 +3093,6 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
}
/**
* qemuMonitorAddObjectType:
* @mon: Pointer to monitor object
* @type: Type name of object to add
* @objalias: Alias of the new object
* @props: Optional arguments for the given type. The object is consumed and
* should not be referenced by the caller after this function returns.
*
* Returns 0 on success -1 on error.
*/
int
qemuMonitorAddObjectType(qemuMonitorPtr mon,
const char *type,
const char *objalias,
virJSONValuePtr props)
{
virJSONValuePtr tmpprops = NULL;
int ret = -1;
VIR_DEBUG("type=%s objalias=%s props=%p", type, objalias, props);
if (!(tmpprops = qemuMonitorCreateObjectPropsWrap(type, objalias, &props)))
goto cleanup;
ret = qemuMonitorAddObject(mon, &tmpprops, NULL);
cleanup:
virJSONValueFree(props);
virJSONValueFree(tmpprops);
return ret;
}
int
qemuMonitorDelObject(qemuMonitorPtr mon,
const char *objalias)
......
......@@ -810,11 +810,6 @@ int qemuMonitorAddObject(qemuMonitorPtr mon,
virJSONValuePtr *props,
char **alias);
int qemuMonitorAddObjectType(qemuMonitorPtr mon,
const char *type,
const char *objalias,
virJSONValuePtr props);
int qemuMonitorDelObject(qemuMonitorPtr mon,
const char *objalias);
......
......@@ -264,28 +264,6 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
}
char *
virQEMUBuildObjectCommandlineFromJSONType(const char *type,
const char *alias,
virJSONValuePtr props)
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
char *ret = NULL;
if (virQEMUBuildObjectCommandlineFromJSONInternal(&buf, type, alias, props) < 0)
goto cleanup;
if (virBufferCheckError(&buf) < 0)
goto cleanup;
ret = virBufferContentAndReset(&buf);
cleanup:
virBufferFreeAndReset(&buf);
return ret;
}
int
virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
virJSONValuePtr objprops)
......
......@@ -43,10 +43,6 @@ int virQEMUBuildCommandLineJSON(virJSONValuePtr value,
virBufferPtr buf,
virQEMUBuildCommandLineJSONArrayFormatFunc array);
char *virQEMUBuildObjectCommandlineFromJSONType(const char *type,
const char *alias,
virJSONValuePtr props);
int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
virJSONValuePtr objprops);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册