- Devel - libvirt List Archives

[libvirt] [PATCH] conf: fix a failure when detaching a usb device
by Guannan Ren 27 Mar '13

27 Mar '13

#virsh detach-device $guest usb.xml error: Failed to detach device from usb2.xml error: operation failed: host usb device vendor=0x0951 \ product=0x1625 not found This regresstion is due to a typo in matching function. The first argument is always the usb device that we are checking for. If the usb xml file provided by user contains bus and device info, we try to search it by them, otherwise, we use vendor and product info. The bug occurred only when detaching a usb device with no bus and device info provided in the usb xml file. --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4cae0d3..2b2f35c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8541,7 +8541,7 @@ static int virDomainHostdevMatchSubsysUSB(virDomainHostdevDefPtr a, virDomainHostdevDefPtr b) { - if (b->source.subsys.u.usb.bus && b->source.subsys.u.usb.device) { + if (a->source.subsys.u.usb.bus && a->source.subsys.u.usb.device) { /* specified by bus location on host */ if (a->source.subsys.u.usb.bus == b->source.subsys.u.usb.bus && a->source.subsys.u.usb.device == b->source.subsys.u.usb.device) -- 1.7.11.2

2 2

[libvirt] [PATCH] qemu: Set migration FD blocking
by Michal Privoznik 26 Mar '13

26 Mar '13

Since we switched from direct host migration scheme to the one, where we connect to the destination and then just pass a FD to a qemu, we have uncovered a qemu bug. Qemu expects migration FD to block. However, we are passing a nonblocking one which results in cryptic error messages like: qemu: warning: error while loading state section id 2 load of migration failed The bug is already known to Qemu folks, but we should workaround already released Qemus. Patch has been originally proposed by Stefan Hajnoczi <stefanha(a)gmail.com> --- src/qemu/qemu_migration.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 537b834..15f3cef 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2657,6 +2657,13 @@ qemuMigrationConnect(virQEMUDriverPtr driver, spec->dest.fd.qemu == -1) goto cleanup; + /* Migration expects a blocking FD */ + if (virSetBlocking(spec->dest.fd.qemu, true) < 0) { + virReportSystemError(errno, _("Unable to set FD %d blocking"), + spec->dest.fd.qemu); + goto cleanup; + } + ret = 0; cleanup: -- 1.8.1.5

4 6

[libvirt] [PATCH] qemu: Don't set type too earla during virtio disk hotplug
by Guido Günther 26 Mar '13

26 Mar '13

f946462e14ac036357b7c11ce5c23f94a3ee4e49 changed behaviour by settings VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI upfront. If we do so before invoking qemuDomainPCIAddressEnsureAddr we merely try to set the PCI slot via qemuDomainPCIAddressReserveSlot instead reserving a new address via qemuDomainPCIAddressSetNextAddr which fails with $ ~/run-tck-test domain/200-disk-hotplug.t ./scripts/domain/200-disk-hotplug.t .. # Creating a new transient domain ./scripts/domain/200-disk-hotplug.t .. 1/5 # Attaching the new disk /var/lib/jenkins/jobs/libvirt-tck-build/workspace/scratchdir/200-disk-hotplug/extra.img # Failed test 'disk has been attached' # at ./scripts/domain/200-disk-hotplug.t line 67. # died: Sys::Virt::Error (libvirt error code: 1, message: internal error unable to reserve PCI address 0:0:0.0 # ) --- This unbreaks libvirt-tck on debian wheezy. Cheers, -- Guido src/qemu/qemu_hotplug.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 044f8cd..576738b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -226,7 +226,6 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390; - else disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } for (i = 0 ; i < vm->def->ndisks ; i++) { @@ -253,7 +252,8 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (qemuDomainCCWAddressAssign(&disk->info, priv->ccwaddrs, !disk->info.addr.ccw.assigned) < 0) goto error; - } else if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + } else if (!disk->info.type || + disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { if (qemuDomainPCIAddressEnsureAddr(priv->pciaddrs, &disk->info) < 0) goto error; } @@ -291,14 +291,17 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, } } } - } else if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI){ + } else if (!disk->info.type || + disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virDevicePCIAddress guestAddr = disk->info.addr.pci; ret = qemuMonitorAddPCIDisk(priv->mon, disk->src, type, &guestAddr); - if (ret == 0) + if (ret == 0) { + disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; memcpy(&disk->info.addr.pci, &guestAddr, sizeof(guestAddr)); + } } qemuDomainObjExitMonitor(driver, vm); -- 1.7.10.4

2 4

[libvirt] [PATCH] Correct DESCRIPTION for virsh help blockcopy
by Yanbing Du 26 Mar '13

26 Mar '13

Signed-off-by: Yanbing Du <ydu(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 592a6e8..fc5cb1e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1603,7 +1603,7 @@ static const vshCmdInfo info_block_copy[] = { .data = N_("Start a block copy operation.") }, {.name = "desc", - .data = N_("Populate a disk from its backing image.") + .data = N_("Copy a disk backing image chain to dest.") }, {.name = NULL} }; -- 1.7.1

2 1

[libvirt] [PATCH] virsh: error out on non-numeric timeout values
by Ján Tomko 26 Mar '13

26 Mar '13

Some block commands and migrate ignored incorrect values. Bug: https://bugzilla.redhat.com/show_bug.cgi?id=927495 --- tools/virsh-domain.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 592a6e8..12bdd58 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1495,14 +1495,14 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int rv; if (blocking) { - if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { - if (timeout < 1) { - vshError(ctl, "%s", _("invalid timeout")); - return false; - } - + if ((rv = vshCommandOptInt(cmd, "timeout", &timeout)) < 0 || + (rv > 0 && timeout < 1)) { + vshError(ctl, "%s", _("invalid timeout")); + return false; + } else if (rv > 0) { /* Ensure that we can multiply by 1000 without overflowing. */ if (timeout > INT_MAX / 1000) { vshError(ctl, "%s", _("timeout is too big")); @@ -1685,18 +1685,18 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int rv; if (blocking) { if (pivot && finish) { vshError(ctl, "%s", _("cannot mix --pivot and --finish")); return false; } - if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { - if (timeout < 1) { - vshError(ctl, "%s", _("invalid timeout")); - return false; - } - + if ((rv = vshCommandOptInt(cmd, "timeout", &timeout)) < 0 || + (rv > 0 && timeout < 1)) { + vshError(ctl, "%s", _("invalid timeout")); + return false; + } else if (rv > 0) { /* Ensure that we can multiply by 1000 without overflowing. */ if (timeout > INT_MAX / 1000) { vshError(ctl, "%s", _("timeout is too big")); @@ -1962,14 +1962,14 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) const char *path = NULL; bool quit = false; int abort_flags = 0; + int rv; if (blocking) { - if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { - if (timeout < 1) { - vshError(ctl, "%s", _("invalid timeout")); - return false; - } - + if ((rv = vshCommandOptInt(cmd, "timeout", &timeout)) < 0 || + (rv > 0 && timeout < 1)) { + vshError(ctl, "%s", _("invalid timeout")); + return false; + } else if (rv > 0) { /* Ensure that we can multiply by 1000 without overflowing. */ if (timeout > INT_MAX / 1000) { vshError(ctl, "%s", _("timeout is too big")); @@ -8456,6 +8456,7 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) int timeout = 0; bool live_flag = false; vshCtrlData data; + int rv; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -8465,18 +8466,17 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "live")) live_flag = true; - if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { + if ((rv = vshCommandOptInt(cmd, "timeout", &timeout)) < 0 || + (rv > 0 && timeout < 1)) { + vshError(ctl, "%s", _("migrate: Invalid timeout")); + goto cleanup; + } else if (rv > 0) { if (! live_flag) { vshError(ctl, "%s", _("migrate: Unexpected timeout for offline migration")); goto cleanup; } - if (timeout < 1) { - vshError(ctl, "%s", _("migrate: Invalid timeout")); - goto cleanup; - } - /* Ensure that we can multiply by 1000 without overflowing. */ if (timeout > INT_MAX / 1000) { vshError(ctl, "%s", _("migrate: Timeout is too big")); -- 1.8.1.5

2 2

[libvirt] [PATCH] Fix virConnectOpen.*() name requirements
by Martin Kletzander 26 Mar '13

26 Mar '13

virConnectOpenAuth didn't require 'name' to be specified (VIR_DEBUG used NULLSTR() for the output) and by default, if name == NULL, the default connection uri is used. This was not indicated in the documentation and wasn't checked for in other API's VIR_DEBUG outputs. --- Thanks to Guannan's patch, this makes the following possible in python: conn = libvirt.open() which I personally find pretty nice. --- src/libvirt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 1624776..4b9ea75 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1334,7 +1334,7 @@ failed: /** * virConnectOpen: - * @name: URI of the hypervisor + * @name: (optional) URI of the hypervisor * * This function should be called first to get a connection to the * Hypervisor and xen store @@ -1362,7 +1362,7 @@ virConnectOpen(const char *name) if (virInitialize() < 0) goto error; - VIR_DEBUG("name=%s", name); + VIR_DEBUG("name=%s", NULLSTR(name)); virResetLastError(); ret = do_open(name, NULL, 0); if (!ret) @@ -1376,7 +1376,7 @@ error: /** * virConnectOpenReadOnly: - * @name: URI of the hypervisor + * @name: (optional) URI of the hypervisor * * This function should be called first to get a restricted connection to the * library functionalities. The set of APIs usable are then restricted @@ -1397,7 +1397,7 @@ virConnectOpenReadOnly(const char *name) if (virInitialize() < 0) goto error; - VIR_DEBUG("name=%s", name); + VIR_DEBUG("name=%s", NULLSTR(name)); virResetLastError(); ret = do_open(name, NULL, VIR_CONNECT_RO); if (!ret) @@ -1411,7 +1411,7 @@ error: /** * virConnectOpenAuth: - * @name: URI of the hypervisor + * @name: (optional) URI of the hypervisor * @auth: Authenticate callback parameters * @flags: bitwise-OR of virConnectFlags * -- 1.8.1.5

2 4

[libvirt] [PATCH] virsh: Let the compiler check usage of all fields in vshCmdOptType enum
by Peter Krempa 26 Mar '13

26 Mar '13

Get rid of the "default" labels to do so. --- tools/virsh.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index b574d7e..0a9ac6f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1172,8 +1172,6 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) case VSH_OT_ALIAS: /* aliases are intentionally undocumented */ continue; - default: - assert(0); } fputc(' ', stdout); fprintf(stdout, fmt, opt->name); @@ -1215,8 +1213,6 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) break; case VSH_OT_ALIAS: continue; - default: - assert(0); } fprintf(stdout, " %-15s %s\n", buf, _(opt->help)); -- 1.8.1.5

2 3

[libvirt] [PATCH] python: set default value to optional arguments
by Guannan Ren 26 Mar '13

26 Mar '13

When prefixing with string (optional) or optional in the description of arguments to libvirt C APIs, in python, these arguments will be set as optional arugments, for example: * virDomainSaveFlags: * @domain: a domain object * @to: path for the output file * @dxml: (optional) XML config for adjusting guest xml used on restore * @flags: bitwise-OR of virDomainSaveRestoreFlags the corresponding python APIs is restoreFlags(self, frm, dxml=None, flags=0) The following python APIs are changed to: blockCommit(self, disk, base, top, bandwidth=0, flags=0) blockPull(self, disk, bandwidth=0, flags=0) blockRebase(self, disk, base, bandwidth=0, flags=0) migrate(self, dconn, flags=0, dname=None, uri=None, bandwidth=0) migrate2(self, dconn, dxml=None, flags=0, dname=None, uri=None, bandwidth=0) migrateToURI(self, duri, flags=0, dname=None, bandwidth=0) migrateToURI2(self, dconnuri=None, miguri=None, dxml=None, flags=0, \ dname=None, bandwidth=0) saveFlags(self, to, dxml=None, flags=0) migrate(self, domain, flags=0, dname=None, uri=None, bandwidth=0) migrate2(self, domain, dxml=None, flags=0, dname=None, uri=None, bandwidth=0) restoreFlags(self, frm, dxml=None, flags=0) --- python/generator.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/python/generator.py b/python/generator.py index 0237374..7586ffc 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1005,6 +1005,8 @@ functions_int_default_test = "%s == -1" def is_integral_type (name): return not re.search ("^(unsigned)? ?(int|long)$", name) is None +def is_optional_arg(info): + return not re.search("^$?\optional$?", info) is None # Functions returning lists which need special rules to check for errors # and raise exceptions. functions_list_exception_test = { @@ -1488,9 +1490,12 @@ def buildWrappers(module): for arg in args: if n != index: classes.write(", %s" % arg[0]) + if arg[0] == "flags" or is_optional_arg(arg[2]): + if is_integral_type(arg[1]): + classes.write("=0") + else: + classes.write("=None") n = n + 1 - if arg[0] == "flags": - classes.write("=0") classes.write("):\n") writeDoc(module, name, args, ' ', classes) n = 0 -- 1.7.11.2

2 3

[libvirt] [PATCH] Remove the redundant parentheses in migrate help
by Yanbing Du 26 Mar '13

26 Mar '13

Signed-off-by: Yanbing Du <ydu(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 128e516..592a6e8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8286,7 +8286,7 @@ static const vshCmdOptDef opts_migrate[] = { }, {.name = "change-protection", .type = VSH_OT_BOOL, - .help = N_("prevent any configuration changes to domain until migration ends)") + .help = N_("prevent any configuration changes to domain until migration ends") }, {.name = "unsafe", .type = VSH_OT_BOOL, -- 1.7.1

3 2

[libvirt] libvirt<->QEMU interfaces for CPU models
by Eduardo Habkost 25 Mar '13

25 Mar '13

Hi, After a long time trying to figure out the proper modelling inside QEMU, I believe the plans are now clearer in QEMU, so it's time to coordinate more closely with libvirt to try to make use of the new stuff. I tried to enumerate the libvirt requirements and current problems, and how we should be able to solve those problems using the X86CPU subclasses and properties, on the following wiki page: http://wiki.qemu.org/Features/CPUModels#Interfaces.2Frequirements_from_libv… I am pasting the section contents below, to facilitate discussion: = Ensuring predictable set of guest features = Requirement: libvirt needs to ensure all features required on the command-line are present and exposed to the guest. Current problem: libvirt doesn't use the "enforce" flag so it can't guarantee that a given feature will be actually exposed to the guest. Solution: use the "enforce" flag on the "-cpu" option. Limitation: no proper machine-friendly interface to report which features are missing. Workaround: See "querying for host capabilities" below. == Future plans == Machine-friendly reporting of missing host features/capabilities. = Listing CPU models = Requirement: libvirt needs to know which CPU models are available to be used with the "-cpu" option. Current problem: libvirt relies on help output parsing for that. Solution: use QMP qom-list-types command. Dependency: X86CPU subclasses. Limitation: needs a live QEMU process for the query. Solution: use QMP query-cpu-definitions command. Limitation: needs a live QEMU process for the query. == Future plans == It would be interesting to get rid of the requirement for a live QEMU process (with a complete machine being created) to be already running. = Getting information about CPU models = Requirement: libvirt uses the predefined CPU models from QEMU, but it needs to be able to query for CPU model details, to find out how it can create a VM that matches what was requested by the user. Current problem: libvirt has a copy of the CPU model definitions on its cpu_map.xml file, and the copy can be out of sync in case CPU models in QEMU change. libvirt also assumes that the set of features on each model is always the same on all machine-types, which is not true. Challenge: the resulting CPU features depend on lots of factors, including the machine-type. Workaround: start a paused VM and query for the CPU device information after the CPU was created. Solution: start a paused VM with no devices, but with the right machine-type and right CPU model. Use QMP QOM commands to query for CPU flags (especially the properties starting with the "f-" prefix). Dependency: X86CPU feature properties ("f-*" properties). Limitation: requires a live QEMU process with the right machine-type/ CPU-model to be started, to make the query. Requirement: libvirt needs to know if a specific CPU model can be used in the current host. See "Ensuring predictable set of guest features" above See "Querying host capabilities" below = Querying host capabilities = Requirement: libvirt needs to know which feature can really be enabled, before it tries to start a VM, and before it tries to start a live-migration process. The set of available capabilities depend on: • Host CPU (hardware) capabilities; • Kernel capabilities (reported by GET_SUPPORTED_CPUID); • QEMU capabilities; • Specific configuration options (e.g. in-kernel IRQ chip is required for some features). Current problem: libvirt uses the CPUID intruction directly and assumes that the presence of a feature in the host CPU means it can be enabled and exposed to the guest. This breaks when virtualization of a feature requires: • Additional hardware support (e.g. INVPCID); • Additional host kernel code (this applies to _all_ CPU features, that need to be reported as supported by GET_SUPPORTED_CPUID); • Additional QEMU-side code; • Specific configuration options (e.g. in-kernel IRQ chip). Challenge: QEMU doesn't have a generic capability-querying interface, and host capability querying depends on KVM to be initialized. Workaround: start a paused VM using the "host" CPU model, that has every single CPU feature supported by the host enabled by default, and query for the information about the CPU though QMP, using the QOM commands. Current solution: start a paused VM with no devices but with "host" CPU model and use QMP QOM commands to query for the enabled CPU features. Dependency: X86CPU feature properties == Future plans == It would be interesting to have a more generic capability-querying interface that doesn't require starting a whole machine with a live QEMU process. See also: -query-capabilities RFC series from Anthony Message-Id: <1332169763-30665-9-git-send-email-aliguori(a)us.ibm.com> -- Eduardo

4 11