- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: eliminate bogus error log when changing netdev's bridge
by Laine Stump 10 Dec '12

10 Dec '12

This fixes a problem that showed up during testing of: https://bugzilla.redhat.com/show_bug.cgi?id=881480 Due to a logic error in the function that gets the name of the bridge an interface connects to, any time a bridge was specified directly (type='bridge') rather than indirectly (type='network'), An error would be logged (although the operation would then complete successfully): Network type 6 is not supported The final virReportError() in the function qemuDomainNetGetBridgeName() was apparently avoided in the past with a "goto cleanup" at the end of each case, but the case of bridge somehow no longer has that final goto cleanup. The proper solution is anyway to not rely on goto's, but put the error log inside an else {} clause, so that it's executed only if the type is neither bridge nor network (in reality, this function should only ever be called for those two types, that's why this is an internal error). While making this change, the error message was also tuned to be more correct (since it's not really the type of the network, but the type of the interface, and it *is* otherwise supported, it's just that the interface type in question doesn't *have* a bridge device associated with it, or at least we don't know how to get it). --- src/qemu/qemu_hotplug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fbd60de..3dfdb65 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1268,13 +1268,13 @@ qemuDomainNetGetBridgeName(virConnectPtr conn, virDomainNetDefPtr net) virNetworkFree(network); virSetError(errobj); virFreeError(errobj); - goto cleanup; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Interface type %d has no bridge name"), + virDomainNetGetActualType(net)); } - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Network type %d is not supported"), - virDomainNetGetActualType(net)); cleanup: return brname; } -- 1.7.11.7

2 1

[libvirt] [PATCH RESEND] S390: Assign default model "virtio" for network interfaces
by Viktor Mihajlovski 10 Dec '12

10 Dec '12

If a network interface model is not specified, libvirt will run into an unchecked NULL pointer coredump. On the other hand if the empty model is ignored, a PCI bus address would be generated, which is not supported by S390. Since the only valid network type model for S390 is virtio, we use this as the default value, which is the same for QEMU. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5335dcf..9009bd2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -810,9 +810,14 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def, } for (i = 0; i < def->nnets ; i++) { + if (STRPREFIX(def->os.arch, "s390") && + def->nets[i]->model == NULL) { + def->nets[i]->model = strdup("virtio"); + } if (STREQ(def->nets[i]->model,"virtio") && - def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { def->nets[i]->info.type = type; + } } for (i = 0; i < def->ncontrollers ; i++) { -- 1.7.0.4

2 2

[libvirt] Entering freeze for 1.0.1 tomorrow
by Daniel Veillard 10 Dec '12

10 Dec '12

I'm just back from vacations without any internet access, and didn't really had time to go though the list mail yet. Is there any serious reson to not enter freeze for 1.0.1 tomorrow ? If not I will make the rc1 candidate tomorrow, thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] ANNOUNCE: Release of libvirt-sandbox version 0.1.1
by Daniel P. Berrange 10 Dec '12

10 Dec '12

I pleased to announce the a new public release of libvirt-sandbox, version 0.1.1, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. This release has focused entirely on improving the virt-sandbox-service tool Changed in this release: - Fix typos in POD docs for some classes - Only depend on libvirt-daemon-{kvm,qemu,lxc}, not full libvirt RPM. - Switch to YUM for extracting package file list - Bind mount whole of /var rather than only some subdirs - Validate unit files exist before creating sandbox - Fixes to population of files in /etc and /var - Finish 'clone' command for copying sandboxes - Populate /etc/machine-id file - Fix systemd dependancies for bulk start/stop of containers - Symlink container journal directory into host filesystem - Rename sandbox.target to multi-user.target - Fix attachment to running containers Thanks to Dan Walsh for basically doing all the work in this release Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH 0/4]use newer video device by -device in qemu commandline
by Guannan Ren 10 Dec '12

10 Dec '12

This patch set aims to use qemu VGA device with -device option to replace -vga option. The mapping is as follows. '-device VGA' maps to '-vga std' '-device cirrus-vga' maps to '-vga cirrus' '-device qxl-vga' maps to '-vga qxl' (there is also '-device qxl' for secondary devices) '-device vmware-svga' maps to '-vga vmware' Through this change, guests will be able to use any available PCI slot number rather than fixed 0x2 slot for primary video device. For backwards compatibility, if a certain qemu version does not support one of the above video device arguments to -device or even -device itself, the -vga will still be used. Guannan Ren(4) [PATCH 1/4] qemu: add qemu various VGA devices Caps flag [PATCH 2/4] conf: add optional attribte primary to video <model> [PATCH 3/4] qemu: use newer -device video device in qemu commandline [PATCH 4/4] doc: add attribute primary doc to video model element docs/formatdomain.html.in | 6 +- src/conf/domain_conf.c | 27 +++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 10 +- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 183 +++++++++++++++++++--------- tests/qemuhelptest.c | 48 ++++++-- .../qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args | 5 +- tests/qemuxml2argvtest.c | 12 +- 9 files changed, 220 insertions(+), 76 deletions(-)

2 7

[libvirt] [PATCHv3 0/2] S390: Adding support for SCLP Console
by Viktor Mihajlovski 10 Dec '12

10 Dec '12

The S390 architecture comes with a native console type (SCLP console) which is now also supported by current QEMU. This series is enabling libvirt to configure S390 domains with SCLP consoles. The domain XML has to be extended for the new console target types 'sclp' and 'sclplm' (line mode = dumb). As usual the QEMU driver must do capability probing in order to find out whether SCLP is supported and format the QEMU command line for the new console type. V2/V3 Changes: Rebased to current master, resolving conflicts. J.B. Joret (2): S390: Add SCLP console front end support S390: Enable SCLP Console in QEMU driver docs/formatdomain.html.in | 19 ++++++- docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 59 ++++++++++++++++++++++ .../qemuxml2argv-console-sclp.args | 8 +++ .../qemuxml2argvdata/qemuxml2argv-console-sclp.xml | 24 +++++++++ tests/qemuxml2argvtest.c | 3 ++ 10 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml -- 1.7.12.4

1 2

[libvirt] [PATCH 4/4] virsh: Add cpu-getmode and cpu-setmode command
by Ichikawa, Ken 10 Dec '12

10 Dec '12

This patch adds new virsh commands 'cpu-getmode' and 'cpu-setmode' using virDomainGetCPUMode and virDomainSetCPUMode. 'cpu-getmode' allows to get cpu mode of a running domain or persistent configuration. 'cpu-setmode' allows to change cpu mode of a domain but affects only persistent configuration. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- tools/virsh-domain.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 19 +++++++++ 2 files changed, 128 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 96e62fc..b4ea137 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5371,6 +5371,113 @@ no_memory: } /* + * "cpu-getmode" command + */ +static const vshCmdInfo info_cpu_getmode[] = { + {"help", N_("show domain cpu mode")}, + {"desc", N_("Show cpu mode of a domain")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_cpu_getmode[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"live", VSH_OT_BOOL, 0, N_("get running state")}, + {"config", VSH_OT_BOOL, 0, N_("get persistent configuration")}, + {"current", VSH_OT_BOOL, 0, N_("get current state configuration")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdCPUGetMode(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + char *mode = NULL; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + bool ret = false; + + if (current + config + live > 1) { + vshError(ctl, "%s", + _("--config, --live, and --current are mutually exclusive")); + return false; + } + + if (config) + flags = VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags = VIR_DOMAIN_AFFECT_LIVE; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (!(mode = virDomainGetCPUMode(dom, flags))) { + vshError(ctl, _("Unable to get cpu mode")); + goto cleanup; + } + + vshPrint(ctl, "%s\n", mode); + + VIR_FREE(mode); + ret = true; + + cleanup: + virDomainFree(dom); + return ret; +} + +/* + * "cpu-setmode" command + */ +static const vshCmdInfo info_cpu_setmode[] = { + {"help", N_("set domain cpu mode")}, + {"desc", N_("Modify cpu mode of a domain")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_cpu_setmode[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"mode", VSH_OT_DATA, VSH_OFLAG_REQ, + N_("cpu mode, one of custom, host-model and host-passthrough")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdCPUSetMode(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + const char *mode = NULL; + bool ret = false; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (vshCommandOptString(cmd, "mode", &mode) < 0) { + vshError(ctl, _("Unable to parse mode.")); + goto cleanup; + } + + if (!mode) { + vshError(ctl, _("CPU mode is not specified.")); + goto cleanup; + } + + if (virDomainSetCPUMode(dom, mode, 0) < 0) { + vshError(ctl, _("Unable to change cpu mode")); + goto cleanup; + } + + vshPrint(ctl, _("CPU mode updated successfully\n")); + + ret = true; + + cleanup: + virDomainFree(dom); + return ret; +} + +/* * "cpu-stats" command */ static const vshCmdInfo info_cpu_stats[] = { @@ -8507,6 +8614,8 @@ const vshCmdDef domManagementCmds[] = { #endif {"cpu-baseline", cmdCPUBaseline, opts_cpu_baseline, info_cpu_baseline, 0}, {"cpu-compare", cmdCPUCompare, opts_cpu_compare, info_cpu_compare, 0}, + {"cpu-getmode", cmdCPUGetMode, opts_cpu_getmode, info_cpu_getmode, 0}, + {"cpu-setmode", cmdCPUSetMode, opts_cpu_setmode, info_cpu_setmode, 0}, {"cpu-stats", cmdCPUStats, opts_cpu_stats, info_cpu_stats, 0}, {"create", cmdCreate, opts_create, info_create, 0}, {"define", cmdDefine, opts_define, info_define, 0}, diff --git a/tools/virsh.pod b/tools/virsh.pod index b0e7064..109e256 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -999,6 +999,25 @@ except that it does some error checking. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment variables, and defaults to C<vi>. +=item B<cpu-getmode> I<domain> [[I<--config>] | [I<--live>] | [I<--current>]] + +Get a domain's cpu mode, corresponding to the B<mode> attribute of B<cpu> +element of the domain XML. If cpu mode is not specified in the domain XML, +'custom' is displayed as a default. + +If I<--live> is specified, affect a running guest. +If I<--config> is specified, affect the next boot of a persistent guest. +If I<--current> is specified, affect the current guest state. +All flags are exclusive. If no flag is specified, behavior is the same as +I<--current>. + +=item B<cpu-setmode> I<domain> I<mode> + +Set a domain's cpu mode, corresponding to the B<mode> attribute of B<cpu> +element of the domain XML. I<mode> can be one of 'custom', 'host-model' +and 'host-passthrough'. Modification affects the next boot of a persistent +guest. + =item B<managedsave> I<domain> [I<--bypass-cache>] [{I<--running> | I<--paused>}] [I<--verbose>] -- 1.7.11.7

1 0

[libvirt] [PATCH 3/4] remote: Add support for virDomainGetCPUMode and virDomainSetCPUMode
by Ichikawa, Ken 10 Dec '12

10 Dec '12

This patch adds support for new APIs virDomainGetCPUMode and virDomainSetCPUMode into remote protocol driver. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- src/remote/remote_driver.c | 2 ++ src/remote/remote_protocol.x | 19 ++++++++++++++++++- src/remote_protocol-structs | 14 ++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 5cc7e32..b2e61b3 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6153,6 +6153,8 @@ static virDriver remote_driver = { .nodeGetMemoryParameters = remoteNodeGetMemoryParameters, /* 0.10.2 */ .nodeGetCPUMap = remoteNodeGetCPUMap, /* 1.0.0 */ .domainFSTrim = remoteDomainFSTrim, /* 1.0.1 */ + .domainSetCPUMode = remoteDomainSetCPUMode, /* 1.0.1 */ + .domainGetCPUMode = remoteDomainGetCPUMode, /* 1.0.1 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index bdad9f0..943d9a0 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2696,6 +2696,21 @@ struct remote_domain_fstrim_args { unsigned int flags; }; +struct remote_domain_set_cpu_mode_args { + remote_nonnull_domain dom; + remote_nonnull_string cpuMode; + unsigned int flags; +}; + +struct remote_domain_get_cpu_mode_args { + remote_nonnull_domain dom; + unsigned int flags; +}; + +struct remote_domain_get_cpu_mode_ret { + remote_nonnull_string cpuMode; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -3042,7 +3057,9 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND_DISK = 292, /* autogen autogen */ REMOTE_PROC_NODE_GET_CPU_MAP = 293, /* skipgen skipgen */ REMOTE_PROC_DOMAIN_FSTRIM = 294, /* autogen autogen */ - REMOTE_PROC_DOMAIN_SEND_PROCESS_SIGNAL = 295 /* autogen autogen */ + REMOTE_PROC_DOMAIN_SEND_PROCESS_SIGNAL = 295, /* autogen autogen */ + REMOTE_PROC_DOMAIN_SET_CPU_MODE = 296, /* autogen autogen */ + REMOTE_PROC_DOMAIN_GET_CPU_MODE = 297 /* autogen autogen */ /* * Notice how the entries are grouped in sets of 10 ? diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index e7d05b8..08e6a18 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2151,6 +2151,18 @@ struct remote_domain_fstrim_args { uint64_t minimum; u_int flags; }; +struct remote_domain_set_cpu_mode_args { + remote_nonnull_domain dom; + remote_nonnull_string cpuMode; + u_int flags; +}; +struct remote_domain_get_cpu_mode_args { + remote_nonnull_domain dom; + u_int flags; +}; +struct remote_domain_get_cpu_mode_ret { + remote_nonnull_string cpuMode; +}; enum remote_procedure { REMOTE_PROC_OPEN = 1, REMOTE_PROC_CLOSE = 2, @@ -2447,4 +2459,6 @@ enum remote_procedure { REMOTE_PROC_NODE_GET_CPU_MAP = 293, REMOTE_PROC_DOMAIN_FSTRIM = 294, REMOTE_PROC_DOMAIN_SEND_PROCESS_SIGNAL = 295, + REMOTE_PROC_DOMAIN_SET_CPU_MODE = 296, + REMOTE_PROC_DOMAIN_GET_CPU_MODE = 297, }; -- 1.7.11.7

1 0

[libvirt] [PATCH 2/4] qemu: Add support for virDomainGetCPUMode and virDomainSetCPUMode
by Ichikawa, Ken 10 Dec '12

10 Dec '12

This patch adds support for virDomainGetCPUMode and virDomainSetCPUMode into qemu driver. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 499ab3b..8988efa 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -207,6 +207,7 @@ virCPUDefFormatBuf; virCPUDefFree; virCPUDefFreeModel; virCPUDefParseXML; +virCPUModeTypeFromString; virCPUModeTypeToString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e099c5c..f86ec1f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14871,6 +14871,133 @@ cleanup: return ret; } +static int +qemuDomainSetCPUMode(virDomainPtr dom, + const char *cpuMode, + unsigned int flags) +{ + virQEMUDriverPtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + virDomainDefPtr persistentDef = NULL; + int mode = -1; + int ret = -1; + + virCheckFlags(0, -1); + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if ((mode = virCPUModeTypeFromString(cpuMode)) < 0){ + virReportError(VIR_ERR_OPERATION_FAILED, + _("Invalid cpu mode '%s'"), cpuMode); + goto cleanup; + } + + /* get persistent configuration */ + if (!vm->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot change persistent config of a " + "transient domain")); + goto cleanup; + } + if (!(persistentDef = virDomainObjGetPersistentDef(driver->caps, vm))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Get persistent config failed")); + goto cleanup; + } + + if (!persistentDef->cpu) { + if (VIR_ALLOC(persistentDef->cpu) < 0) + goto no_memory; + persistentDef->cpu->type = VIR_CPU_TYPE_GUEST; + } + + persistentDef->cpu->mode = mode; + + if (virDomainSaveConfig(driver->configDir, persistentDef) < 0) + goto cleanup; + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +no_memory: + virReportOOMError(); + goto cleanup; +} + +static char * +qemuDomainGetCPUMode(virDomainPtr dom, unsigned int flags) +{ + virQEMUDriverPtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + const char *cpuMode = NULL; + char *ret = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, NULL); + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (virDomainLiveConfigHelperMethod(driver->caps, vm, &flags, &def) < 0) + goto cleanup; + + /* use correct domain definition according to flags */ + if (flags & VIR_DOMAIN_AFFECT_LIVE) + def = vm->def; + + /* If there is no cpu element, return default cpu mode. */ + if (!def->cpu) { + if (!(cpuMode = virCPUModeTypeToString(VIR_CPU_MODE_CUSTOM))){ + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown cpu mode in domain definition '%d'"), + VIR_CPU_MODE_CUSTOM); + goto cleanup; + } + if (!(ret = strdup(cpuMode))) + goto no_memory; + goto cleanup; + } + + if (!(cpuMode = virCPUModeTypeToString(def->cpu->mode))){ + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown cpu mode in domain definition '%d'"), + def->cpu->mode); + goto cleanup; + } + if (!(ret = strdup(cpuMode))) + goto no_memory; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +no_memory: + virReportOOMError(); + goto cleanup; +} + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = QEMU_DRIVER_NAME, @@ -15045,6 +15172,8 @@ static virDriver qemuDriver = { .nodeSetMemoryParameters = nodeSetMemoryParameters, /* 0.10.2 */ .nodeGetCPUMap = nodeGetCPUMap, /* 1.0.0 */ .domainFSTrim = qemuDomainFSTrim, /* 1.0.1 */ + .domainSetCPUMode = qemuDomainSetCPUMode, /* 1.0.1 */ + .domainGetCPUMode = qemuDomainGetCPUMode, /* 1.0.1 */ }; -- 1.7.11.7

1 0

[libvirt] [PATCH 1/4] API: Introduce new public APIs virDomainGetCPUMode and virDomainSetCPUMode
by Ichikawa, Ken 10 Dec '12

10 Dec '12

This patch adds new public APIs virDomainGetCPUMode and virDomainSetCPUMode to get/set cpu mode of a domain. These APIs are useful for users who want to get/set cpu mode easily without messing around with domain XML by themselves. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- include/libvirt/libvirt.h.in | 9 ++++ src/driver.h | 11 +++++ src/libvirt.c | 112 +++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 2 + 4 files changed, 134 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 17804ca..3e5fbc3 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1739,6 +1739,15 @@ virDomainGetMetadata(virDomainPtr domain, const char *uri, unsigned int flags); +int +virDomainSetCPUMode(virDomainPtr domain, + const char *cpuMode, + unsigned int flags); + +char * +virDomainGetCPUMode(virDomainPtr domain, + unsigned int flags); + /* * XML domain description */ diff --git a/src/driver.h b/src/driver.h index 64d652f..1fc8668 100644 --- a/src/driver.h +++ b/src/driver.h @@ -915,6 +915,15 @@ typedef int unsigned long long minimum, unsigned int flags); +typedef int + (*virDrvDomainSetCPUMode)(virDomainPtr dom, + const char *cpuMode, + unsigned int flags); + +typedef char * + (*virDrvDomainGetCPUMode)(virDomainPtr dom, + unsigned int flags); + /** * _virDriver: * @@ -1107,6 +1116,8 @@ struct _virDriver { virDrvNodeGetCPUMap nodeGetCPUMap; virDrvDomainFSTrim domainFSTrim; virDrvDomainSendProcessSignal domainSendProcessSignal; + virDrvDomainSetCPUMode domainSetCPUMode; + virDrvDomainGetCPUMode domainGetCPUMode; }; typedef int diff --git a/src/libvirt.c b/src/libvirt.c index 6a7a817..9545f36 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9616,6 +9616,118 @@ error: } /** + * virDomainSetCPUMode: + * @domain: a domain object + * @cpuMode: cpu mode, one of 'custom', 'host-model' and 'host-passthrough' + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Change cpu mode of a domain to @cpuMode. + * @cpuMode means mode attribute of cpu element of the domain XML. + * This function does not affect a running domain state but affects + * the next boot of a persistent domain. + * + * Returns 0 on success, -1 in case of failure. + */ +int +virDomainSetCPUMode(virDomainPtr domain, + const char *cpuMode, + unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(domain, "cpuMode=%s, flags=%x", cpuMode, flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->flags & VIR_CONNECT_RO) { + virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + if (conn->driver->domainSetCPUMode) { + int ret; + ret = conn->driver->domainSetCPUMode(domain, cpuMode, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(domain->conn); + return -1; +} + +/** + * virDomainGetCPUMode: + * @domain: a domain object + * @flags: bitwise-OR of virDomainModificationImpact + * + * Get cpu mode of a domain. The cpu mode is specified in mode + * attribute of cpu element of the domain XML. + * If there is no cpu element or mode attribute, this function + * returns 'custom' because 'custom' mode is default. + * + * @flags controls whether the live domain or persistent + * configuration will be queried. If VIR_AFFECT_LIVE is set, this + * will query a running domain state. If VIR_AFFECT_CONFIG is set, + * this will query a persistent configuration. + * If neither flag is specified or VIR_AFFECT_CURRENT is set, this + * will query a running domain state for active domains or a persistent + * configuration for inactive domains. + * These flags are mutually exclusive. + * + * Returns cpu mode string on success (caller must free), + * or NULL in case of failure. + */ +char * +virDomainGetCPUMode(virDomainPtr domain, unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + goto error; + } + + if ((flags & VIR_DOMAIN_AFFECT_LIVE) && + (flags & VIR_DOMAIN_AFFECT_CONFIG)) { + virReportInvalidArg(flags, + _("flags 'affect live' and 'affect config' in %s are mutually exclusive"), + __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainGetCPUMode) { + char *ret; + ret = conn->driver->domainGetCPUMode(domain, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(domain->conn); + return NULL; +} + +/** * virNodeGetSecurityModel: * @conn: a connection object * @secmodel: pointer to a virSecurityModel structure diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index e3d63d3..8fc407d 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -578,6 +578,8 @@ LIBVIRT_1.0.1 { global: virDomainFSTrim; virDomainSendProcessSignal; + virDomainSetCPUMode; + virDomainGetCPUMode; } LIBVIRT_1.0.0; # .... define new API here using predicted next version number .... -- 1.7.11.7

1 0