On 09/13/2017 08:52 AM, Peter Krempa wrote:
Block job QMP commands with underscores rather than dashes were
never
released in upstream qemu, (they were added, but modified in the same
release [1]), but a certain distro managed to backport the version in the
middle.
I find it fine that you don't call out the "certain distro" by name in
the commit message - but several readers can probably already guess, so
I'm not spilling the beans further if I clear my throat a bit
"<cough>RHEL 6</cough>".
Let's visit the consequences of this patch: If downstream Red Hat wants
to rebase to a version of libvirt containing this patch, that downstream
version will HAVE to use the modern spelling only - but presumably that
rebase will only be done in tandem with a new enough qemu that also
supplies the modern spelling. Meanwhile, when it comes to supporting
loooong lifecycles of older releases, downstream has already picked the
version of libvirt they intend to maintain forever, and will NOT be
rebasing either libvirt or qemu, so they won't be missing anything
dropped in this patch because they won't be using this patch.
So I welcome this cleanup.
The change also slightly modified semantics for the abort command, which
made us have a lot of code which was only ever present in certain
downstream distros.
Clean the upstream code from the legacy cruft and support only the
upstream implementations.
[1] See qemu commit v1.0-2176-gdb58f9c060
---
src/qemu/qemu_domain.c | 13 +++--------
src/qemu/qemu_domain.h | 2 +-
src/qemu/qemu_driver.c | 60 +++++++++++++-------------------------------------
3 files changed, 19 insertions(+), 56 deletions(-)
@@ -16511,7 +16494,7 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver,
baseSource);
if (!baseSource || basePath)
ret = qemuMonitorBlockStream(priv->mon, device, basePath, backingPath,
- speed, modern);
+ speed, true);
Presumably a later patch cleans this up further?
Reviewed-by: Eric Blake <eblake(a)redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization:
qemu.org |
libvirt.org