- Devel - libvirt List Archives

[libvirt] [libvirt-glib] Remove redundant 'Config' in GIR identifiers
by Zeeshan Ali (Khattak) 28 Sep '11

28 Sep '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> libvirt-gconfig is in a separate namespace than libvirt-gobject so there is not reason to expose 'Config' part of identifiers to high-level languages. --- libvirt-gconfig/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index fbcb7ba..6f1c628 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -64,7 +64,7 @@ LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la $(G_IR_SCANNER) Makefile.am --namespace LibvirtGConfig \ --nsversion 1.0 \ --include GObject-2.0 \ - --identifier-prefix=GVir \ + --identifier-prefix=GVirConfig \ --symbol-prefix=gvir \ --library=$(builddir)/libvirt-gconfig-1.0.la \ --output $@ \ -- 1.7.6.2

2 1

[libvirt] [PATCH] qemu: Init the pci device before reattachment
by Osier Yang 28 Sep '11

28 Sep '11

This patch is just like commit 2ce90ea296, to init the member of pciDevice before reattachment, otherwise the device won't be unbound from pci_stub, and won't get the original driver (no probing). --- src/qemu/qemu_hostdev.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 6f77717..74c817c 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -292,6 +292,7 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); + pciDeviceReAttachInit(dev); qemuReattachPciDevice(dev, driver); } -- 1.7.6

2 2

[libvirt] [PATCH] qemu: Finish domain shutdown on reconnect
by Jiri Denemark 28 Sep '11

28 Sep '11

If a domain started with -no-shutdown shuts down while libvirtd is not running, it will be seen as paused when libvirtd reconnects to it. Use the paused reason to detect if a domain was stopped because of shutdown and finish the process just as if a SHUTDOWN event is delivered from qemu. --- src/qemu/qemu_process.c | 50 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 21e6fbf..106a47c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -429,18 +429,15 @@ cleanup: } -static int -qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - virDomainObjPtr vm) +static void +qemuProcessShutdownOrReboot(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - VIR_DEBUG("vm=%p", vm); - virDomainObjLock(vm); if (priv->gotShutdown) { VIR_DEBUG("Ignoring repeated SHUTDOWN event from domain %s", vm->def->name); - goto cleanup; + return; } priv->gotShutdown = true; @@ -454,16 +451,23 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); qemuProcessKill(vm, true); - if (virDomainObjUnref(vm) == 0) - vm = NULL; + /* Safe to ignore value since ref count was incremented above */ + ignore_value(virDomainObjUnref(vm)); } } else { qemuProcessKill(vm, true); } +} -cleanup: - if (vm) - virDomainObjUnlock(vm); +static int +qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virDomainObjPtr vm) +{ + VIR_DEBUG("vm=%p", vm); + + virDomainObjLock(vm); + qemuProcessShutdownOrReboot(vm); + virDomainObjUnlock(vm); return 0; } @@ -2572,6 +2576,8 @@ qemuProcessReconnect(void *opaque) qemuDomainObjPrivatePtr priv; virConnectPtr conn = data->conn; struct qemuDomainJobObj oldjob; + int state; + int reason; memcpy(&oldjob, &data->oldjob, sizeof(oldjob)); @@ -2603,7 +2609,8 @@ qemuProcessReconnect(void *opaque) if (qemuProcessUpdateState(driver, obj) < 0) goto error; - if (virDomainObjGetState(obj, NULL) == VIR_DOMAIN_SHUTOFF) { + state = virDomainObjGetState(obj, &reason); + if (state == VIR_DOMAIN_SHUTOFF) { VIR_DEBUG("Domain '%s' wasn't fully started yet, killing it", obj->def->name); goto error; @@ -2618,6 +2625,18 @@ qemuProcessReconnect(void *opaque) &priv->qemuCaps) < 0) goto error; + /* In case the domain was paused for shutdown while we were not running, + * we need to finish the shutdown process. And we need to do it after + * we have qemuCaps filled in. + */ + if (state == VIR_DOMAIN_PAUSED + && reason == VIR_DOMAIN_PAUSED_SHUTTING_DOWN) { + VIR_DEBUG("Domain %s shut down while we were not running;" + " finishing shutdown sequence", obj->def->name); + qemuProcessShutdownOrReboot(obj); + goto endjob; + } + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { priv->persistentAddrs = 1; @@ -2647,12 +2666,13 @@ qemuProcessReconnect(void *opaque) if (obj->def->id >= driver->nextvmid) driver->nextvmid = obj->def->id + 1; - if (virDomainObjUnref(obj) > 0) - virDomainObjUnlock(obj); - +endjob: if (qemuDomainObjEndJob(driver, obj) == 0) obj = NULL; + if (obj && virDomainObjUnref(obj) > 0) + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); virConnectClose(conn); -- 1.7.6.1

2 2

[libvirt] [PATCH] qemu: Check domain status details when reconnecting monitor
by Jiri Denemark 28 Sep '11

28 Sep '11

Current qemu is able to give us detailed domain status (not just if it is running or not) which we can translate into a status reason. --- src/qemu/qemu_monitor.c | 66 +++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_monitor.h | 25 +++++++++++++++- src/qemu/qemu_monitor_json.c | 15 +++++++++- src/qemu/qemu_monitor_json.h | 4 ++- src/qemu/qemu_monitor_text.c | 20 ++++++++++++- src/qemu/qemu_monitor_text.h | 4 ++- src/qemu/qemu_process.c | 15 ++++++---- 7 files changed, 134 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b4c43ae..6e84131 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -81,6 +81,12 @@ VIR_ENUM_IMPL(qemuMonitorMigrationStatus, QEMU_MONITOR_MIGRATION_STATUS_LAST, "inactive", "active", "completed", "failed", "cancelled") +VIR_ENUM_IMPL(qemuMonitorVMStatus, + QEMU_MONITOR_VM_STATUS_LAST, + "debug", "inmigrate", "internal-error", "io-error", "paused", + "postmigrate", "prelaunch", "finish-migrate", "restore-vm", + "running", "save-vm", "shutdown", "watchdog") + char *qemuMonitorEscapeArg(const char *in) { int len = 0; @@ -1059,10 +1065,12 @@ qemuMonitorStopCPUs(qemuMonitorPtr mon) int -qemuMonitorGetStatus(qemuMonitorPtr mon, bool *running) +qemuMonitorGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason) { int ret; - VIR_DEBUG("mon=%p, running=%p", mon, running); + VIR_DEBUG("mon=%p, running=%p, reason=%p", mon, running, reason); if (!mon || !running) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1071,9 +1079,9 @@ qemuMonitorGetStatus(qemuMonitorPtr mon, bool *running) } if (mon->json) - ret = qemuMonitorJSONGetStatus(mon, running); + ret = qemuMonitorJSONGetStatus(mon, running, reason); else - ret = qemuMonitorTextGetStatus(mon, running); + ret = qemuMonitorTextGetStatus(mon, running, reason); return ret; } @@ -2553,3 +2561,53 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon, ret = qemuMonitorTextBlockJob(mon, device, bandwidth, info, mode); return ret; } + +int qemuMonitorVMStatusToPausedReason(const char *status) +{ + int st; + + if (!status) + return VIR_DOMAIN_PAUSED_UNKNOWN; + + if ((st = qemuMonitorVMStatusTypeFromString(status)) < 0) { + VIR_WARN("Qemu reported unknown VM status: '%s'", status); + return VIR_DOMAIN_PAUSED_UNKNOWN; + } + + switch ((qemuMonitorVMStatus) st) { + case QEMU_MONITOR_VM_STATUS_DEBUG: + case QEMU_MONITOR_VM_STATUS_INTERNAL_ERROR: + case QEMU_MONITOR_VM_STATUS_RESTORE_VM: + return VIR_DOMAIN_PAUSED_UNKNOWN; + + case QEMU_MONITOR_VM_STATUS_INMIGRATE: + case QEMU_MONITOR_VM_STATUS_POSTMIGRATE: + case QEMU_MONITOR_VM_STATUS_FINISH_MIGRATE: + return VIR_DOMAIN_PAUSED_MIGRATION; + + case QEMU_MONITOR_VM_STATUS_IO_ERROR: + return VIR_DOMAIN_PAUSED_IOERROR; + + case QEMU_MONITOR_VM_STATUS_PAUSED: + case QEMU_MONITOR_VM_STATUS_PRELAUNCH: + return VIR_DOMAIN_PAUSED_USER; + + case QEMU_MONITOR_VM_STATUS_RUNNING: + VIR_WARN("Qemu reports the guest is paused but status is 'running'"); + return VIR_DOMAIN_PAUSED_UNKNOWN; + + case QEMU_MONITOR_VM_STATUS_SAVE_VM: + return VIR_DOMAIN_PAUSED_SAVE; + + case QEMU_MONITOR_VM_STATUS_SHUTDOWN: + return VIR_DOMAIN_PAUSED_SHUTTING_DOWN; + + case QEMU_MONITOR_VM_STATUS_WATCHDOG: + return VIR_DOMAIN_PAUSED_WATCHDOG; + + /* unreachable from this point on */ + case QEMU_MONITOR_VM_STATUS_LAST: + ; + } + return VIR_DOMAIN_PAUSED_UNKNOWN; +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 477767f..a64c2c3 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -198,7 +198,30 @@ int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, int qemuMonitorStartCPUs(qemuMonitorPtr mon, virConnectPtr conn); int qemuMonitorStopCPUs(qemuMonitorPtr mon); -int qemuMonitorGetStatus(qemuMonitorPtr mon, bool *running); + +typedef enum { + QEMU_MONITOR_VM_STATUS_DEBUG, + QEMU_MONITOR_VM_STATUS_INMIGRATE, + QEMU_MONITOR_VM_STATUS_INTERNAL_ERROR, + QEMU_MONITOR_VM_STATUS_IO_ERROR, + QEMU_MONITOR_VM_STATUS_PAUSED, + QEMU_MONITOR_VM_STATUS_POSTMIGRATE, + QEMU_MONITOR_VM_STATUS_PRELAUNCH, + QEMU_MONITOR_VM_STATUS_FINISH_MIGRATE, + QEMU_MONITOR_VM_STATUS_RESTORE_VM, + QEMU_MONITOR_VM_STATUS_RUNNING, + QEMU_MONITOR_VM_STATUS_SAVE_VM, + QEMU_MONITOR_VM_STATUS_SHUTDOWN, + QEMU_MONITOR_VM_STATUS_WATCHDOG, + + QEMU_MONITOR_VM_STATUS_LAST +} qemuMonitorVMStatus; +VIR_ENUM_DECL(qemuMonitorVMStatus) +int qemuMonitorVMStatusToPausedReason(const char *status); + +int qemuMonitorGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason); int qemuMonitorSystemReset(qemuMonitorPtr mon); int qemuMonitorSystemPowerdown(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e38c2ed..b720617 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -896,13 +896,19 @@ qemuMonitorJSONStopCPUs(qemuMonitorPtr mon) int -qemuMonitorJSONGetStatus(qemuMonitorPtr mon, bool *running) +qemuMonitorJSONGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason) { int ret; + const char *status; virJSONValuePtr cmd; virJSONValuePtr reply = NULL; virJSONValuePtr data; + if (reason) + *reason = VIR_DOMAIN_PAUSED_UNKNOWN; + if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL))) return -1; @@ -928,6 +934,13 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, bool *running) goto cleanup; } + if ((status = virJSONValueObjectGetString(data, "status"))) { + if (!*running && reason) + *reason = qemuMonitorVMStatusToPausedReason(status); + } else if (!*running) { + VIR_DEBUG("query-status reply was missing status details"); + } + ret = 0; cleanup: diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 673444f..1a40716 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -46,7 +46,9 @@ int qemuMonitorJSONCheckHMP(qemuMonitorPtr mon); int qemuMonitorJSONStartCPUs(qemuMonitorPtr mon, virConnectPtr conn); int qemuMonitorJSONStopCPUs(qemuMonitorPtr mon); -int qemuMonitorJSONGetStatus(qemuMonitorPtr mon, bool *running); +int qemuMonitorJSONGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason); int qemuMonitorJSONSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorJSONSystemReset(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index cedf582..57e74a8 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -392,11 +392,16 @@ qemuMonitorTextStopCPUs(qemuMonitorPtr mon) { int -qemuMonitorTextGetStatus(qemuMonitorPtr mon, bool *running) +qemuMonitorTextGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason) { char *reply; int ret = -1; + if (reason) + *reason = VIR_DOMAIN_PAUSED_UNKNOWN; + if (qemuMonitorHMPCommand(mon, "info status", &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot get status info")); @@ -406,6 +411,19 @@ qemuMonitorTextGetStatus(qemuMonitorPtr mon, bool *running) if (strstr(reply, "running")) { *running = true; } else if (strstr(reply, "paused")) { + char *status; + + if ((status = strchr(reply, '('))) { + char *end = strchr(status, ')'); + if (end) + *end = '\0'; + else + status = NULL; + } + if (!status) + VIR_DEBUG("info status was missing status details"); + else if (reason) + *reason = qemuMonitorVMStatusToPausedReason(status); *running = false; } else { qemuReportError(VIR_ERR_OPERATION_FAILED, diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 4651a17..207001d 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -43,7 +43,9 @@ int qemuMonitorTextCommandWithFd(qemuMonitorPtr mon, int qemuMonitorTextStartCPUs(qemuMonitorPtr mon, virConnectPtr conn); int qemuMonitorTextStopCPUs(qemuMonitorPtr mon); -int qemuMonitorTextGetStatus(qemuMonitorPtr mon, bool *running); +int qemuMonitorTextGetStatus(qemuMonitorPtr mon, + bool *running, + virDomainPausedReason *reason); int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorTextSystemReset(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c8f22e2..21e6fbf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2321,11 +2321,12 @@ qemuProcessUpdateState(struct qemud_driver *driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; virDomainState state; + virDomainPausedReason reason; bool running; int ret; qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorGetStatus(priv->mon, &running); + ret = qemuMonitorGetStatus(priv->mon, &running, &reason); qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret < 0 || !virDomainObjIsActive(vm)) @@ -2339,9 +2340,10 @@ qemuProcessUpdateState(struct qemud_driver *driver, virDomainObjPtr vm) virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED); } else if (state == VIR_DOMAIN_RUNNING && !running) { - VIR_DEBUG("Domain %s was paused while its monitor was disconnected;" - " changing state to paused", vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN); + VIR_DEBUG("Domain %s was paused (%s) while its monitor was" + " disconnected; changing state to paused", + vm->def->name, virDomainPausedReasonTypeToString(reason)); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); } else if (state == VIR_DOMAIN_SHUTOFF && running) { VIR_DEBUG("Domain %s finished booting; changing state to running", vm->def->name); @@ -3470,6 +3472,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, char *timestamp; qemuDomainObjPrivatePtr priv = vm->privateData; bool running = true; + virDomainPausedReason reason; virSecurityLabelPtr seclabel = NULL; VIR_DEBUG("Beginning VM attach process"); @@ -3599,7 +3602,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, qemuDomainObjExitMonitorWithDriver(driver, vm); goto cleanup; } - if (qemuMonitorGetStatus(priv->mon, &running) < 0) { + if (qemuMonitorGetStatus(priv->mon, &running, &reason) < 0) { qemuDomainObjExitMonitorWithDriver(driver, vm); goto cleanup; } @@ -3616,7 +3619,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_UNPAUSED); else - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_UNKNOWN); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, reason); VIR_DEBUG("Writing domain status to disk"); if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) -- 1.7.6.1

2 2

[libvirt] [PATCH] qemu: Always remove domain object if MigratePrepare fails
by Jiri Denemark 28 Sep '11

28 Sep '11

If migration failed in Prepare phase after virDomainAssignDef and before a job is started, the domain object was not properly removed. --- src/qemu/qemu_migration.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0a5a13d..ea49093 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1178,8 +1178,12 @@ cleanup: virDomainDefFree(def); VIR_FORCE_CLOSE(dataFD[0]); VIR_FORCE_CLOSE(dataFD[1]); - if (vm) - virDomainObjUnlock(vm); + if (vm) { + if (vm->persistent) + virDomainObjUnlock(vm); + else + qemuDomainRemoveInactive(driver, vm); + } if (event) qemuDomainEventQueue(driver, event); qemuMigrationCookieFree(mig); @@ -1188,9 +1192,6 @@ cleanup: endjob: if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; - } else if (!vm->persistent) { - qemuDomainRemoveInactive(driver, vm); - vm = NULL; } goto cleanup; } -- 1.7.6.1

2 5

[libvirt] [libvirt-glib] Refactor two very huge functions a bit
by Zeeshan Ali (Khattak) 28 Sep '11

28 Sep '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 126 ++++++++++++++------------ 1 files changed, 69 insertions(+), 57 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index f97b50a..c0c47da 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -374,6 +374,51 @@ void gvir_connection_close(GVirConnection *conn) g_signal_emit_by_name(conn, "vir-connection-closed"); } +typedef gint (* CountFunction) (virConnectPtr vconn); +typedef gint (* ListFunction) (virConnectPtr vconn, gchar **lst, gint max); + +static gchar ** fetch_list(virConnectPtr vconn, + const char *name, + CountFunction count_func, + ListFunction list_func, + GCancellable *cancellable, + gint *length, + GError **err) +{ + gchar **lst = NULL; + gint n = 0; + gint i; + + if ((n = count_func(vconn)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to count %s", name); + goto error; + } + + if (n) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto error; + + lst = g_new(gchar *, n); + if ((n = list_func(vconn, lst, n)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to list %s %d", name, n); + goto error; + } + } + + *length = n; + return lst; + +error: + for (i = 0 ; i < n; i++) + g_free(lst[i]); + g_free(lst); + return NULL; +} + /** * gvir_connection_fetch_domains: * @conn: the connection @@ -431,25 +476,15 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - if ((ninactive = virConnectNumOfDefinedDomains(vconn)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count domains"); + inactive = fetch_list(vconn, + "Domains", + virConnectNumOfDefinedDomains, + virConnectListDefinedDomains, + cancellable, + &ninactive, + err); + if (*err != NULL) goto cleanup; - } - - if (ninactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - inactive = g_new(gchar *, ninactive); - if ((ninactive = virConnectListDefinedDomains(vconn, inactive, ninactive)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list domains %d", ninactive); - goto cleanup; - } - } doms = g_hash_table_new_full(g_str_hash, g_str_equal, @@ -544,51 +579,28 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - if ((nactive = virConnectNumOfStoragePools(vconn)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count pools"); + active = fetch_list(vconn, + "Storage Pools", + virConnectNumOfStoragePools, + virConnectListStoragePools, + cancellable, + &nactive, + err); + if (*err != NULL) goto cleanup; - } - if (nactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - active = g_new(gchar *, nactive); - if ((nactive = virConnectListStoragePools(vconn, - active, - nactive)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list pools"); - goto cleanup; - } - } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - if ((ninactive = virConnectNumOfDefinedStoragePools(vconn)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to count pools"); + inactive = fetch_list(vconn, + "Storage Pools", + virConnectNumOfDefinedStoragePools, + virConnectListDefinedStoragePools, + cancellable, + &ninactive, + err); + if (*err != NULL) goto cleanup; - } - - if (ninactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - inactive = g_new(gchar *, ninactive); - if ((ninactive = virConnectListDefinedStoragePools(vconn, - inactive, - ninactive)) < 0) { - *err = gvir_error_new(GVIR_CONNECTION_ERROR, - 0, - "Unable to list pools %d", ninactive); - goto cleanup; - } - } pools = g_hash_table_new_full(g_str_hash, g_str_equal, -- 1.7.6.2

2 1

[libvirt] [libvirt-glib] Plug a leak
by Zeeshan Ali (Khattak) 27 Sep '11

27 Sep '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 074fe53..f97b50a 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -645,6 +645,8 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, ret = TRUE; cleanup: + for (i = 0 ; i < nactive ; i++) + g_free(active[i]); g_free(active); for (i = 0 ; i < ninactive ; i++) g_free(inactive[i]); -- 1.7.6.2

2 1

[libvirt] [PATCH] fix AppArmor driver for pipe character devices
by Jamie Strandboge 27 Sep '11

27 Sep '11

The AppArmor security driver adds only the path specified in the domain XML for character devices of type 'pipe'. It should be using <path>.in and <path>.out. We do this by creating a new vah_add_file_chardev() and use it for char devices instead of vah_add_file(). Also adjust valid_path() to accept S_FIFO (since qemu chardevs of type 'pipe' use fifos). This is https://launchpad.net/bugs/832507 -- Jamie Strandboge | http://www.canonical.com

2 2

[libvirt] [PATCH] virsh: Allow using domain and capabilities XMLs with cpu-compare
by Peter Krempa 27 Sep '11

27 Sep '11

This patch adds extraction of the <cpu> element from capabilities and domain definition XML documents to improve user experience. https://bugzilla.redhat.com/show_bug.cgi?id=731151 --- tools/virsh.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 8 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3c6e65a..ddb61af 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11846,9 +11846,15 @@ static bool cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) { const char *from = NULL; - bool ret = true; + bool ret = false; char *buffer; int result; + const char *snippet; + + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlBufferPtr xml_buf = NULL; + xmlNodePtr node; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -11856,37 +11862,69 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptString(cmd, "file", &from) <= 0) return false; - if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) { + vshError(ctl, _("Failed to read file '%s' to compare."), + from); return false; + } - result = virConnectCompareCPU(ctl->conn, buffer, 0); - VIR_FREE(buffer); + /* try to extract the CPU element from as it would appear in a domain XML*/ + if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) + goto cleanup; + + if ((node = virXPathNode("/cpu|" + "/domain/cpu|" + "/capabilities/host/cpu", ctxt))) { + if (!(xml_buf = xmlBufferCreate())) { + vshError(ctl, _("Can't create XML buffer to extract CPU element.")); + goto cleanup; + } + + if (xmlNodeDump(xml_buf, xml, node, 0, 0) < 0) { + vshError(ctl, _("Failed to extract CPU element snippet from domain XML.")); + goto cleanup; + } + + snippet = (const char *) xmlBufferContent(xml_buf); + } else { + vshError(ctl, _("File '%s' does not contain a <cpu> element or is not " + "a valid domain or capabilities XML"), from); + goto cleanup; + } + + result = virConnectCompareCPU(ctl->conn, snippet, 0); switch (result) { case VIR_CPU_COMPARE_INCOMPATIBLE: vshPrint(ctl, _("CPU described in %s is incompatible with host CPU\n"), from); - ret = false; + goto cleanup; break; case VIR_CPU_COMPARE_IDENTICAL: vshPrint(ctl, _("CPU described in %s is identical to host CPU\n"), from); - ret = true; break; case VIR_CPU_COMPARE_SUPERSET: vshPrint(ctl, _("Host CPU is a superset of CPU described in %s\n"), from); - ret = true; break; case VIR_CPU_COMPARE_ERROR: default: vshError(ctl, _("Failed to compare host CPU with %s"), from); - ret = false; + goto cleanup; } + ret = true; + +cleanup: + VIR_FREE(buffer); + xmlBufferFree(xml_buf); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + return ret; } -- 1.7.3.4

2 3

[libvirt] [PATCH] virsh: Allow using complete <capabilities> elements with cpu-baseline
by Peter Krempa 27 Sep '11

27 Sep '11

This patch cleans the cpu baseline function using new libvirt helper functions and fixes XPath expression that selects <cpu> elements from the source file, that can contain concatenated <capabilities> XMLs, domain XMLs and bare <cpu> elements. The fixed XPath expression ensures not to select NUMA <cpu id=... elements. https://bugzilla.redhat.com/show_bug.cgi?id=731645 --- tools/virsh.c | 88 ++++++++++++++++++++++++-------------------------------- 1 files changed, 38 insertions(+), 50 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3c6e65a..7ea5e1b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11908,18 +11908,18 @@ static bool cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) { const char *from = NULL; - bool ret = true; + bool ret = false; char *buffer; char *result = NULL; const char **list = NULL; - unsigned int count = 0; - xmlDocPtr doc = NULL; - xmlNodePtr node_list; + int count = 0; + + xmlDocPtr xml = NULL; + xmlNodePtr *node_list = NULL; xmlXPathContextPtr ctxt = NULL; - xmlSaveCtxtPtr sctxt = NULL; - xmlBufferPtr buf = NULL; - xmlXPathObjectPtr obj = NULL; - int res, i; + xmlBufferPtr xml_buf = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + int i; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -11930,69 +11930,57 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) return false; - doc = xmlNewDoc(NULL); - if (doc == NULL) + /* add an separate container around the xml */ + virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); + if (virBufferError(&buf)) goto no_memory; - res = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0, - (const xmlChar *)buffer, &node_list); - if (res != 0) { - vshError(ctl, _("Failed to parse XML fragment %s"), from); - ret = false; + VIR_FREE(buffer); + buffer = virBufferContentAndReset(&buf); + + + if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) + goto cleanup; + + if ((count = virXPathNodeSet("//cpu[not(ancestor::cpus)]", + ctxt, &node_list)) == -1) + goto cleanup; + + if (count == 0) { + vshError(ctl, _("No host CPU specified in '%s'"), from); goto cleanup; } - xmlAddChildList((xmlNodePtr) doc, node_list); + list = vshCalloc(ctl, count, sizeof(const char *)); - ctxt = xmlXPathNewContext(doc); - if (!ctxt) + if (!(xml_buf = xmlBufferCreate())) goto no_memory; - obj = xmlXPathEval(BAD_CAST "//cpu[not(ancestor::cpu)]", ctxt); - if ((obj == NULL) || (obj->nodesetval == NULL) || - (obj->nodesetval->nodeTab == NULL)) - goto cleanup; + for (i = 0; i < count; i++) { + xmlBufferEmpty(xml_buf); - for (i = 0;i < obj->nodesetval->nodeNr;i++) { - buf = xmlBufferCreate(); - if (buf == NULL) - goto no_memory; - sctxt = xmlSaveToBuffer(buf, NULL, 0); - if (sctxt == NULL) { - xmlBufferFree(buf); - goto no_memory; + if (xmlNodeDump(xml_buf, xml, node_list[i], 0, 0) < 0) { + vshError(ctl, _("Failed to extract <cpu> element")); + goto cleanup; } - xmlSaveTree(sctxt, obj->nodesetval->nodeTab[i]); - xmlSaveClose(sctxt); - - list = vshRealloc(ctl, list, sizeof(char *) * (count + 1)); - list[count++] = (char *) buf->content; - buf->content = NULL; - xmlBufferFree(buf); - buf = NULL; - } - - if (count == 0) { - vshError(ctl, _("No host CPU specified in '%s'"), from); - ret = false; - goto cleanup; + list[i] = vshStrdup(ctl, (const char *)xmlBufferContent(xml_buf)); } result = virConnectBaselineCPU(ctl->conn, list, count, 0); - if (result) + if (result) { vshPrint(ctl, "%s", result); - else - ret = false; + ret = true; + } cleanup: - xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); - xmlFreeDoc(doc); + xmlFreeDoc(xml); + xmlBufferFree(xml_buf); VIR_FREE(result); if ((list != NULL) && (count > 0)) { - for (i = 0;i < count;i++) + for (i = 0; i < count; i++) VIR_FREE(list[i]); } VIR_FREE(list); -- 1.7.3.4

2 3