External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-03 02:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all usage of virRun

Browse Source 
Catch the individual usage not removed in previous commits.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2020-04-22 16:25:24 +02:00
parent e0bc87cab8
commit 36f09bd3c3
4 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lxc/lxc_driver.c
View File

@ -1423,10 +1423,11 @@ lxcDomainDestroy(virDomainPtr dom)
static int lxcCheckNetNsSupport(void) static int lxcCheckNetNsSupport(void)
{ {
const char *argv[] = {"ip", "link", "set", "lo", "netns", "-1", NULL}; g_autoptr(virCommand) cmd = virCommandNewArgList("ip", "link", "set", "lo",
"netns", "-1", NULL);
int ip_rc; int ip_rc;
if (virRun(argv, &ip_rc) < 0 || ip_rc == 255) if (virCommandRun(cmd, &ip_rc) < 0 || ip_rc == 255)
return 0; return 0;
if (virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_NET) < 0) if (virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_NET) < 0)

16
src/qemu/qemu_domain.c
View File

@ -7553,20 +7553,20 @@ qemuDomainSnapshotForEachQcow2Raw(virQEMUDriverPtr driver,
bool try_all, bool try_all,
int ndisks) int ndisks)
{ {
const char *qemuimgarg[] = { NULL, "snapshot", NULL, NULL, NULL, NULL }; const char *qemuimgbin;
size_t i; size_t i;
bool skipped = false; bool skipped = false;
qemuimgarg[0] = qemuFindQemuImgBinary(driver); qemuimgbin = qemuFindQemuImgBinary(driver);
if (qemuimgarg[0] == NULL) { if (qemuimgbin == NULL) {
/* qemuFindQemuImgBinary set the error */ /* qemuFindQemuImgBinary set the error */
return -1; return -1;
} }
qemuimgarg[2] = op;
qemuimgarg[3] = name;
for (i = 0; i < ndisks; i++) { for (i = 0; i < ndisks; i++) {
g_autoptr(virCommand) cmd = virCommandNewArgList(qemuimgbin, "snapshot",
op, name, NULL);
/* FIXME: we also need to handle LVM here */ /* FIXME: we also need to handle LVM here */
if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
int format = virDomainDiskGetFormat(def->disks[i]); int format = virDomainDiskGetFormat(def->disks[i]);
@ -7593,9 +7593,9 @@ qemuDomainSnapshotForEachQcow2Raw(virQEMUDriverPtr driver,
return -1; return -1;
} }
qemuimgarg[4] = virDomainDiskGetSource(def->disks[i]); virCommandAddArg(cmd, virDomainDiskGetSource(def->disks[i]));
if (virRun(qemuimgarg, NULL) < 0) { if (virCommandRun(cmd, NULL) < 0) {
if (try_all) { if (try_all) {
VIR_WARN("skipping snapshot action on %s", VIR_WARN("skipping snapshot action on %s",
def->disks[i]->dst); def->disks[i]->dst);

11
src/security/security_apparmor.c
View File

@ -203,15 +203,10 @@ load_profile(virSecurityManagerPtr mgr G_GNUC_UNUSED,
static int static int
remove_profile(const char *profile) remove_profile(const char *profile)
{ {
int rc = -1; g_autoptr(virCommand) cmd = virCommandNewArgList(VIRT_AA_HELPER, "-D", "-u",
const char * const argv[] = { profile, NULL);
VIRT_AA_HELPER, "-D", "-u", profile, NULL
};
if (virRun(argv, NULL) == 0) return virCommandRun(cmd, NULL);
rc = 0;
return rc;
} }
static char * static char *

24
src/util/virnetdev.c
View File

@ -508,6 +508,7 @@ int virNetDevSetNamespace(const char *ifname, pid_t pidInNs)
g_autofree char *pid = NULL; g_autofree char *pid = NULL;
g_autofree char *phy = NULL; g_autofree char *phy = NULL;
g_autofree char *phy_path = NULL; g_autofree char *phy_path = NULL;
g_autoptr(virCommand) cmd = NULL;
int len; int len;
pid = g_strdup_printf("%lld", (long long) pidInNs); pid = g_strdup_printf("%lld", (long long) pidInNs);
@ -518,28 +519,19 @@ int virNetDevSetNamespace(const char *ifname, pid_t pidInNs)
if ((len = virFileReadAllQuiet(phy_path, 1024, &phy)) <= 0) { if ((len = virFileReadAllQuiet(phy_path, 1024, &phy)) <= 0) {
/* Not a wireless device. */ /* Not a wireless device. */
const char *argv[] = { cmd = virCommandNewArgList("ip", "link",
"ip", "link", "set", ifname, "netns", NULL, NULL "set", ifname, "netns", pid, NULL);
};
argv[5] = pid;
if (virRun(argv, NULL) < 0)
return -1;
} else { } else {
const char *argv[] = {
"iw", "phy", NULL, "set", "netns", NULL, NULL
};
/* Remove a line break. */ /* Remove a line break. */
phy[len - 1] = '\0'; phy[len - 1] = '\0';
argv[2] = phy; cmd = virCommandNewArgList("iw", "phy", phy,
argv[5] = pid; "set", "netns", pid, NULL);
if (virRun(argv, NULL) < 0)
return -1;
} }
if (virCommandRun(cmd, NULL) < 0)
return -1;
return 0; return 0;
} }