- Devel - libvirt List Archives

[libvirt] [PATCH] xen: Remove unused 'cfg'
by Peter Krempa 09 Dec '19

09 Dec '19

Refactoring of the XML parser left few instances of the libxlDriverConfig object unused. Remove them. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule as it makes clang unhappy. src/libxl/libxl_domain.c | 1 - tests/xlconfigtest.c | 1 - tests/xmconfigtest.c | 1 - 3 files changed, 3 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ff9502d3bb..915aaeb8b0 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1547,7 +1547,6 @@ libxlDomainDefCheckABIStability(libxlDriverPrivatePtr driver, { virDomainDefPtr migratableDefSrc = NULL; virDomainDefPtr migratableDefDst = NULL; - g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); bool ret = false; if (!(migratableDefSrc = virDomainDefCopy(src, driver->xmlopt, NULL, true)) || diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 3c0469be85..4e4b28cd34 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -72,7 +72,6 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars) int ret = -1; virDomainDefPtr def = NULL; char *replacedXML = NULL; - g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); if (VIR_ALLOC_N(gotxlcfgData, wrote) < 0) goto fail; diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 7e324eb5d2..6bd18d0fe1 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -45,7 +45,6 @@ testCompareParseXML(const char *xmcfg, const char *xml) virConnectPtr conn = NULL; int wrote = 4096; virDomainDefPtr def = NULL; - g_autoptr(libxlDriverConfig) cfg = libxlDriverConfigGet(driver); if (VIR_ALLOC_N(gotxmcfgData, wrote) < 0) goto fail; -- 2.23.0

1 0

[libvirt] [PATCH] qemu: snapshot: Mark file becoming backingStore as read-only
by Peter Krempa 09 Dec '19

09 Dec '19

For any backing file we set 'read-only' to true, but didn't do this when modifying the recorded backing store when creating external snapshots. This meant that qemu would attempt to open the backing-file read-write. This would fail for example when selinux is used as qemu doesn't have write permission for the backing file. https://bugzilla.redhat.com/show_bug.cgi?id=1781079 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 738e8832cc..96e811a893 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14659,6 +14659,7 @@ qemuDomainSnapshotCreateInactiveExternal(virQEMUDriverPtr driver, goto cleanup; if (virStorageSourceHasBacking(defdisk->src)) { + defdisk->src->readonly = true; newsrc->backingStore = g_steal_pointer(&defdisk->src); } else { virObjectUnref(defdisk->src); @@ -15510,6 +15511,7 @@ qemuDomainSnapshotDiskUpdateSource(virQEMUDriverPtr driver, qemuDomainSnapshotDiskUpdateSourceRenumber(dd->disk->src); if (dd->persistdisk) { + dd->persistdisk->src->readonly = true; dd->persistsrc->backingStore = g_steal_pointer(&dd->persistdisk->src); dd->persistdisk->src = g_steal_pointer(&dd->persistsrc); } -- 2.23.0

2 1

[libvirt] [python PATCH] Remove 'Makefile'
by Peter Krempa 09 Dec '19

09 Dec '19

Python world uses setup.py for everything so our Makefile is just a "convenience" wrapper for people using to type 'make'. Remove it as it doesn't add that much value and would need to be updated for python 3. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Makefile | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 6c8da0a..0000000 --- a/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Shim wrapper around setup.py to allow for familiar build targets - -PYTHON ?= python - -all: - $(PYTHON) setup.py build - -install: all - $(PYTHON) setup.py install - -clean: - $(PYTHON) setup.py clean - -check: all - $(PYTHON) setup.py test - -rpm: - $(PYTHON) setup.py rpm -- 2.23.0

2 1

[libvirt] [PATCH v2] qemu: cold-unplug of sound
by Jidong Xia 09 Dec '19

09 Dec '19

With this patch users can cold unplug some sound devices. use "virsh detach-device vm sound.xml --config" command. Signed-off-by: Jidong Xia <xiajidong(a)cmss.chinamobile.com> --- src/conf/domain_conf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 9 ++++++++- 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9580884..4b28502 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2753,6 +2753,14 @@ void virDomainSoundDefFree(virDomainSoundDefPtr def) VIR_FREE(def); } +virDomainSoundDefPtr +virDomainSoundDefRemove(virDomainDefPtr def, size_t idx) +{ + virDomainSoundDefPtr ret = def->sounds[idx]; + VIR_DELETE_ELEMENT(def->sounds, idx, def->nsounds); + return ret; +} + void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) { if (!def) @@ -14554,6 +14562,46 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt, } +static bool +virDomainSoundDefEquals(const virDomainSoundDef *a, + const virDomainSoundDef *b) +{ + size_t i; + + if (a->model != b->model) + return false; + + if (a->ncodecs != b->ncodecs) + return false; + + for (i = 0; i < a->ncodecs; i++) { + if (a->codecs[i]->type != b->codecs[i]->type) + return false; + } + + if (a->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + !virDomainDeviceInfoAddressIsEqual(&a->info, &b->info)) + return false; + + return true; +} + + +ssize_t +virDomainSoundDefFind(const virDomainDef *def, + const virDomainSoundDef *sound) +{ + size_t i; + + for (i = 0; i < def->nsounds; i++) { + if (virDomainSoundDefEquals(sound, def->sounds[i])) + return i; + } + + return -1; +} + + static virDomainWatchdogDefPtr virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 49cb697..cdb7b92 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2883,7 +2883,10 @@ void virDomainChrDefFree(virDomainChrDefPtr def); int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest, virDomainChrSourceDefPtr src); void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); +ssize_t virDomainSoundDefFind(const virDomainDef *def, + const virDomainSoundDef *sound); void virDomainSoundDefFree(virDomainSoundDefPtr def); +virDomainSoundDefPtr virDomainSoundDefRemove(virDomainDefPtr def, size_t idx); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8fe0bf9..cdbd64f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -578,7 +578,9 @@ virDomainSmartcardTypeFromString; virDomainSmartcardTypeToString; virDomainSmbiosModeTypeFromString; virDomainSmbiosModeTypeToString; +virDomainSoundDefFind; virDomainSoundDefFree; +virDomainSoundDefRemove; virDomainSoundModelTypeFromString; virDomainSoundModelTypeToString; virDomainStartupPolicyTypeFromString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 18bd010..8d91bb2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8302,6 +8302,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, { virDomainDiskDefPtr disk, det_disk; virDomainNetDefPtr net; + virDomainSoundDefPtr sound; virDomainHostdevDefPtr hostdev, det_hostdev; virDomainLeaseDefPtr lease, det_lease; virDomainControllerDefPtr cont, det_cont; @@ -8330,6 +8331,13 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainNetDefFree(virDomainNetRemove(vmdef, idx)); break; + case VIR_DOMAIN_DEVICE_SOUND: + sound = dev->data.sound; + if ((idx = virDomainSoundDefFind(vmdef, sound)) < 0) + return -1; + virDomainSoundDefFree(virDomainSoundDefRemove(vmdef, idx)); + break; + case VIR_DOMAIN_DEVICE_HOSTDEV: { hostdev = dev->data.hostdev; if ((idx = virDomainHostdevFind(vmdef, hostdev, &det_hostdev)) < 0) { @@ -8460,7 +8468,6 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, vmdef->vsock = NULL; break; - case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_HUB: -- 1.8.3.1

2 2

[libvirt] [PATCH] qemu: checkpoint: fix NULL dereference at create time
by Cole Robinson 08 Dec '19

08 Dec '19

'cfg' is never initialized here, which causes a crash later in qemuCheckpointCreateFinalize Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_checkpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index d5af6b99bf..58cf337833 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -468,7 +468,7 @@ qemuCheckpointCreateXML(virDomainPtr domain, bool update_current = true; bool redefine = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; unsigned int parse_flags = 0; - g_autoptr(virQEMUDriverConfig) cfg = NULL; + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virCaps) caps = NULL; g_autoptr(virDomainCheckpointDef) def = NULL; -- 2.23.0

2 1

[libvirt] [PATCH 0/4] drop usage of c-strcase gnulib module
by Pavel Hrdina 08 Dec '19

08 Dec '19

Pavel Hrdina (4): use g_ascii_strcasecmp instead of c_strcasecmp from gnulib use g_ascii_strncasecmp instead of c_strncasecmp from gnulib syntax-check: update strcase check to refer to GLib bootstrap.conf: drop usage of c-strcase gnulib module bootstrap.conf | 1 - build-aux/syntax-check.mk | 2 +- src/internal.h | 11 +++++------ tests/virhashtest.c | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) -- 2.23.0

2 5

[libvirt] [PATCH 0/8] qemu: Fix non-shared storage migration over NBD (blockdev-add sequels)
by Peter Krempa 06 Dec '19

06 Dec '19

I put some blockdev awareness into the non-shared storage migration NBD code but it was not complete. Seeing it there mislead me thinking that it's done. Fix it now. Peter Krempa (8): qemu: migration: Simplify handling of 'diskAlias' when adding NBD exports qemu: migration: Properly export backend for NBD storage migration qemu: migration: Access job name from job struct qemu: migration: Simplify cleanup in qemuMigrationSrcNBDCopyCancelOne qemu: blockjob: Allow NULL 'mirror' for block copy jobs due to migration qemu: migration: Split out setup of the migration target qemu: migration: Mention disk target rather than the drive name in debug msg qemu: migration: Properly setup mirror for blockdev configurations src/qemu/qemu_blockjob.c | 11 +++- src/qemu/qemu_migration.c | 115 ++++++++++++++++++++++++-------------- 2 files changed, 80 insertions(+), 46 deletions(-) -- 2.23.0

2 16

Re: [libvirt] [PATCH for-4.2?] block/qcow2-bitmap: fix crash bug in qcow2_co_remove_persistent_dirty_bitmap
by Eric Blake 06 Dec '19

06 Dec '19

On 12/5/19 1:30 PM, Vladimir Sementsov-Ogievskiy wrote: > Here is double bug: > > First, return error but not set errp. This may lead to: > qmp block-dirty-bitmap-remove may report success when actually failed > > block-dirty-bitmap-remove used in a transaction will crash, as > qmp_transaction will think that it returned success and will cal call > block_dirty_bitmap_remove_commit which will crash, as state->bitmap is > NULL > > Second (like in anecdote), this case is not an error at all. As it is > documented in the comment above bdrv_co_remove_persistent_dirty_bitmap > definition, absence of bitmap is not an error, and similar case handled > at start of qcow2_co_remove_persistent_dirty_bitmap, it returns 0 when > there is no bitmaps at all.. double . > > But when there are some bitmaps, but not the requested one, it return > error with errp unset. > > Fix that. > > Fixes: b56a1e31759b750 > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> > --- > > Hi all! > > Ohm, suddenly we faced this bug. It's a regression in 4.2. I'm very > sorry for introducing it, and it sad that it's found so late.. > > Personally, I think that this one worth rc5, as it makes new bitmap > interfaces unusable. But the decision is yours. > > Last minute edit: hmm, actually, transaction action introduced in > 4.2, so crash is not a regression, only broken block-dirty-bitmap-remove > command is a regression... Maybe it's OK for stable. Libvirt REALLY wants to use transaction bitmap management (and require qemu 4.2) for its incremental backup patches that Peter is almost ready to merge in. I'm trying to ascertain: When exactly can this bug hit? Can you give a sequence of QMP commands that will trigger it for easy reproduction? Are there workarounds (such as checking that a bitmap exists prior to attempting to remove it)? If it does NOT get fixed in rc5, how will libvirt be able to probe whether the fix is in place? > > block/qcow2-bitmap.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c > index 8abaf632fc..c6c8ebbe89 100644 > --- a/block/qcow2-bitmap.c > +++ b/block/qcow2-bitmap.c > @@ -1469,8 +1469,10 @@ int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, > Qcow2BitmapList *bm_list; > > if (s->nb_bitmaps == 0) { > - /* Absence of the bitmap is not an error: see explanation above > - * bdrv_remove_persistent_dirty_bitmap() definition. */ > + /* > + * Absence of the bitmap is not an error: see explanation above > + * bdrv_co_remove_persistent_dirty_bitmap() definition. > + */ > return 0; > } > > @@ -1485,7 +1487,8 @@ int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, > > bm = find_bitmap_by_name(bm_list, name); > if (bm == NULL) { > - ret = -EINVAL; > + /* Absence of the bitmap is not an error, see above. */ > + ret = 0; > goto out; > } > > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org

3 8

[libvirt] Offline manipulation of Dirty Bitmaps by qemu-img
by John Snow 06 Dec '19

06 Dec '19

This has come up in the past, and I believe we discussed this at KVM Forum, too: There have been requests from oVirt (via Nir Soffer) to add some offline bitmap manipulation functionality. In the past, our stance has generally been "Use QEMU without an accelerator, and use QMP to manipulate the images." We like this for a few reasons: 1. It keeps bitmap management code tightly centralized 2. It allows for the full suite of bitmap manipulations in either offline or online mode with one tool 3. We wouldn't have to write new code. 4. Or design new CLIs and duplicate our existing work. 5. Or write even more tests. However, tools like oVirt may or may not be fully equipped to launch QEMU in this context, and there is always a desire for qemu-img to be able to "do more", so existing management suites could extend functionality more easily. (Or so I am imagining.) I am still leaning heavily against adding any more CLI commands or options to qemu-img right now. Even if we do add some of the fundamental ones like "add" or "remove", it seems only a matter of time before we have to add "clear", "merge", etc. Is this just a race to code duplication? On the other hand, one of the other suggestions is to have qemu-img check --repair optionally delete corrupted bitmaps. I kind of like this idea: it's a buyer beware operation that might make management layers unhappy, but then again ... repair is always something that could make things worse. Plus, if you manage to corrupt bitmaps badly enough that they can't even be parsed, you might need a heavyweight repair operation. Nir, do you think that'd be sufficient for your needs for now, or would you still like to see more granular offline management? --js

3 3

[libvirt] [PATCH 0/3] qemu: fix setting of block job speed (blockdev-add sequels)
by Peter Krempa 06 Dec '19

06 Dec '19

See patch 3. Peter Krempa (3): qemu: domain: Mention searched disk in error of qemuDomainDiskByName qemu: driver: Use qemuDomainDiskByName instead of virDomainDiskByName qemu: driver: Use appropriate job name when setting blockjob speed src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_driver.c | 20 ++++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) -- 2.23.0

2 4