mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-01 20:05:46 +00:00
qemu: capabilities: Don't make callers check return of virQEMUCapsNew(Binary)
The allocation of the object itself can't fail. What can fail is the creation of the class on a programming error. Rather than punting the error up the stack abort() directly on the first occurence as the error can't be fixed during runtime. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
bc52cc2fe4
commit
e61adbf26b
@ -1827,11 +1827,9 @@ virQEMUCapsNew(void)
|
|||||||
virQEMUCaps *qemuCaps;
|
virQEMUCaps *qemuCaps;
|
||||||
|
|
||||||
if (virQEMUCapsInitialize() < 0)
|
if (virQEMUCapsInitialize() < 0)
|
||||||
return NULL;
|
abort();
|
||||||
|
|
||||||
if (!(qemuCaps = virObjectNew(virQEMUCapsClass)))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
|
qemuCaps = virObjectNew(virQEMUCapsClass);
|
||||||
qemuCaps->invalidation = true;
|
qemuCaps->invalidation = true;
|
||||||
qemuCaps->flags = virBitmapNew(QEMU_CAPS_LAST);
|
qemuCaps->flags = virBitmapNew(QEMU_CAPS_LAST);
|
||||||
|
|
||||||
@ -1844,7 +1842,6 @@ virQEMUCapsNewBinary(const char *binary)
|
|||||||
{
|
{
|
||||||
virQEMUCaps *qemuCaps = virQEMUCapsNew();
|
virQEMUCaps *qemuCaps = virQEMUCapsNew();
|
||||||
|
|
||||||
if (qemuCaps)
|
|
||||||
qemuCaps->binary = g_strdup(binary);
|
qemuCaps->binary = g_strdup(binary);
|
||||||
|
|
||||||
return qemuCaps;
|
return qemuCaps;
|
||||||
@ -1990,9 +1987,6 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps)
|
|||||||
g_autoptr(virQEMUCaps) ret = virQEMUCapsNewBinary(qemuCaps->binary);
|
g_autoptr(virQEMUCaps) ret = virQEMUCapsNewBinary(qemuCaps->binary);
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
if (!ret)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
ret->invalidation = qemuCaps->invalidation;
|
ret->invalidation = qemuCaps->invalidation;
|
||||||
ret->kvmSupportsNesting = qemuCaps->kvmSupportsNesting;
|
ret->kvmSupportsNesting = qemuCaps->kvmSupportsNesting;
|
||||||
ret->kvmSupportsSecureGuest = qemuCaps->kvmSupportsSecureGuest;
|
ret->kvmSupportsSecureGuest = qemuCaps->kvmSupportsSecureGuest;
|
||||||
@ -5877,12 +5871,9 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch,
|
|||||||
const char *kernelVersion,
|
const char *kernelVersion,
|
||||||
virCPUData* cpuData)
|
virCPUData* cpuData)
|
||||||
{
|
{
|
||||||
g_autoptr(virQEMUCaps) qemuCaps = NULL;
|
g_autoptr(virQEMUCaps) qemuCaps = virQEMUCapsNewBinary(binary);
|
||||||
struct stat sb;
|
struct stat sb;
|
||||||
|
|
||||||
if (!(qemuCaps = virQEMUCapsNewBinary(binary)))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
/* We would also want to check faccessat if we cared about ACLs,
|
/* We would also want to check faccessat if we cared about ACLs,
|
||||||
* but we don't. */
|
* but we don't. */
|
||||||
if (stat(binary, &sb) < 0) {
|
if (stat(binary, &sb) < 0) {
|
||||||
@ -5968,9 +5959,6 @@ virQEMUCapsLoadFile(const char *filename,
|
|||||||
virQEMUCapsCachePriv *priv = privData;
|
virQEMUCapsCachePriv *priv = privData;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!qemuCaps)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
ret = virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename, false);
|
ret = virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename, false);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -3198,8 +3198,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (n > 0) {
|
if (n > 0) {
|
||||||
if (!(qemuCaps = virQEMUCapsNew()))
|
qemuCaps = virQEMUCapsNew();
|
||||||
return -1;
|
|
||||||
|
|
||||||
for (i = 0; i < n; i++) {
|
for (i = 0; i < n; i++) {
|
||||||
g_autofree char *str = virXMLPropString(nodes[i], "name");
|
g_autofree char *str = virXMLPropString(nodes[i], "name");
|
||||||
|
@ -458,8 +458,7 @@ cpuTestMakeQEMUCaps(const struct data *data)
|
|||||||
cpu, true, false, fail_no_props, &model) < 0)
|
cpu, true, false, fail_no_props, &model) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (!(qemuCaps = virQEMUCapsNew()))
|
qemuCaps = virQEMUCapsNew();
|
||||||
return NULL;
|
|
||||||
|
|
||||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM);
|
virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM);
|
||||||
if (data->flags == JSON_MODELS ||
|
if (data->flags == JSON_MODELS ||
|
||||||
|
@ -95,9 +95,9 @@ testQemuCaps(const void *opaque)
|
|||||||
binary = g_strdup_printf("/usr/bin/qemu-system-%s",
|
binary = g_strdup_printf("/usr/bin/qemu-system-%s",
|
||||||
data->archName);
|
data->archName);
|
||||||
|
|
||||||
if (!(capsActual = virQEMUCapsNewBinary(binary)) ||
|
capsActual = virQEMUCapsNewBinary(binary);
|
||||||
virQEMUCapsInitQMPMonitor(capsActual,
|
|
||||||
qemuMonitorTestGetMonitor(mon)) < 0)
|
if (virQEMUCapsInitQMPMonitor(capsActual, qemuMonitorTestGetMonitor(mon)) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (virQEMUCapsGet(capsActual, QEMU_CAPS_KVM)) {
|
if (virQEMUCapsGet(capsActual, QEMU_CAPS_KVM)) {
|
||||||
|
@ -64,8 +64,7 @@ testQemuGetCaps(char *caps)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(qemuCaps = virQEMUCapsNew()))
|
qemuCaps = virQEMUCapsNew();
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 0; i < n; i++) {
|
for (i = 0; i < n; i++) {
|
||||||
g_autofree char *str = virXMLPropString(nodes[i], "name");
|
g_autofree char *str = virXMLPropString(nodes[i], "name");
|
||||||
|
@ -68,8 +68,7 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt,
|
|||||||
|
|
||||||
priv = (*vm)->privateData;
|
priv = (*vm)->privateData;
|
||||||
|
|
||||||
if (!(priv->qemuCaps = virQEMUCapsNew()))
|
priv->qemuCaps = virQEMUCapsNew();
|
||||||
return -1;
|
|
||||||
|
|
||||||
virQEMUCapsInitQMPBasicArch(priv->qemuCaps);
|
virQEMUCapsInitQMPBasicArch(priv->qemuCaps);
|
||||||
|
|
||||||
|
@ -81,10 +81,7 @@ mymain(void)
|
|||||||
DO_TEST("pc-kvm", 0);
|
DO_TEST("pc-kvm", 0);
|
||||||
DO_TEST("pc-tcg", 0);
|
DO_TEST("pc-tcg", 0);
|
||||||
|
|
||||||
if (!(qemuCaps = virQEMUCapsNew())) {
|
qemuCaps = virQEMUCapsNew();
|
||||||
ret = -1;
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
|
|
||||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI);
|
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_PCI);
|
||||||
|
|
||||||
|
@ -322,8 +322,7 @@ mymain(void)
|
|||||||
if (qemuTestDriverInit(&driver) < 0)
|
if (qemuTestDriverInit(&driver) < 0)
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|
||||||
if (!(qemuCaps = virQEMUCapsNew()))
|
qemuCaps = virQEMUCapsNew();
|
||||||
return EXIT_FAILURE;
|
|
||||||
|
|
||||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA);
|
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA);
|
||||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC);
|
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC);
|
||||||
|
@ -372,12 +372,11 @@ virQEMUCaps *
|
|||||||
qemuTestParseCapabilitiesArch(virArch arch,
|
qemuTestParseCapabilitiesArch(virArch arch,
|
||||||
const char *capsFile)
|
const char *capsFile)
|
||||||
{
|
{
|
||||||
g_autoptr(virQEMUCaps) qemuCaps = NULL;
|
|
||||||
g_autofree char *binary = g_strdup_printf("/usr/bin/qemu-system-%s",
|
g_autofree char *binary = g_strdup_printf("/usr/bin/qemu-system-%s",
|
||||||
virArchToString(arch));
|
virArchToString(arch));
|
||||||
|
g_autoptr(virQEMUCaps) qemuCaps = virQEMUCapsNewBinary(binary);
|
||||||
|
|
||||||
if (!(qemuCaps = virQEMUCapsNewBinary(binary)) ||
|
if (virQEMUCapsLoadCache(arch, qemuCaps, capsFile, true) < 0)
|
||||||
virQEMUCapsLoadCache(arch, qemuCaps, capsFile, true) < 0)
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
return g_steal_pointer(&qemuCaps);
|
return g_steal_pointer(&qemuCaps);
|
||||||
@ -896,8 +895,7 @@ testQemuInfoSetArgs(struct testQemuInfo *info,
|
|||||||
testQemuInfoArgName argname;
|
testQemuInfoArgName argname;
|
||||||
int flag;
|
int flag;
|
||||||
|
|
||||||
if (!(info->args.fakeCaps = virQEMUCapsNew()))
|
info->args.fakeCaps = virQEMUCapsNew();
|
||||||
abort();
|
|
||||||
|
|
||||||
info->conf = conf;
|
info->conf = conf;
|
||||||
info->args.newargs = true;
|
info->args.newargs = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user