Commit Graph

77 Commits

Author SHA1 Message Date
Richard W.M. Jones
9871c4190e Improve the error message for -i vmx with a .vmdk file
resolves: RHEL-19564
2023-12-19 13:05:38 +00:00
Richard W.M. Jones
29228bce64 Rebase to virt-v2v 2.3.7
Implement --key all:...
  resolves: RHEL-18142
Fix off-by-one error causing rare crash
  resolves: RHEL-19061
2023-12-11 17:20:49 +00:00
Richard W.M. Jones
09f3b77799 -it ssh: Double quote ssh command which tests remote file exists
resolves: RHEL-12105
2023-11-10 15:21:21 +00:00
Laszlo Ersek
ac1270e705 make the appliance kernel uniprocessor in %check / gating...
... for working around RHBZ#2216496.

(This change is unrelated to RHBZ#2182024, highlighted below.)

resolves: rhbz#2182024
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2023-07-03 15:59:29 +02:00
Laszlo Ersek
9f79ec032d improve UX when running as root and we can't chown v2v tmpdir or socks
resolves: rhbz#2182024
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2023-06-30 11:14:16 +02:00
Laszlo Ersek
a7a1117b6b start all libvirtd services after installing libvirt-daemon-kvm
https://lists.corp.redhat.com/archives/osci-list/2023-June/001238.html

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2023-06-26 11:28:34 +02:00
Laszlo Ersek
552929e8d3 recognize "--key /dev/mapper/VG-LV🔑password"; fix %check phase
(1) Backport the upstream patches for recognizing the command line option

      --key /dev/mapper/VG-LV🔑password

    Similarly to the backports for guestfs-tools BZ#2209280 and libguestfs
    BZ#2209279, here we need to update the common submodule (thankfully we
    need not excise any hunks -- we had to do that for libguestfs).

    Unlike those "single-step" submodule updates however, for virt-v2v we
    bridge the same submodule commit range 70c10a079a30..b636c3f20a1b in
    two steps, stopping at commit 38e6988c1864 in the middle. We do that
    simply because that's how upstream virt-v2v moved; i.e., there are two
    upstream patches to cherry-pick for advancing our submodule reference.

(2) In dist-git commit ef9a918d7e, there was a typo: the "test" command
    was left out. Therefore even our simple test conversion has not been
    invoked -- see e.g.
    <https://download.eng.bos.redhat.com/brewroot/vol/rhel-9/packages/virt-v2v/2.3.4/2.el9/data/logs/x86_64/build.log>:

> + -s test-data/phony-guests/windows.img
> /var/tmp/rpm-tmp.UMecKA: line 48: -s: command not found

    Unfortunately, incorrectly (not) invoking "test -s" has had results
    identical to invoking "test -s" correctly and "test -s" failing;
    therefore we've been just silently skipping our simple conversion,
    assuming "no non-empty guest disk images".

    Fix this typo...

(3) ... and then run the sole "test-v2v-fedora-luks-on-lvm-conversion.sh"
    test from the test suite, for verifying the backport in the build
    environment. (The idea for the future is that we'd run such individual
    tests whenever backporting patches.) For this, we also start depending
    (at build time) on the sqlite3 command.

resolves: rhbz#2168506
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2023-06-20 16:40:47 +02:00
Richard W.M. Jones
0aadbb4e02 Remove --block-driver option downstream
resolves: rhbz#2190387
2023-04-28 12:41:31 +01:00
Richard W.M. Jones
5e9160dca7 Rebase to virt-v2v 2.3.4
resolves: rhbz#2187961, rhbz#2175703, rhbz#2172075, rhbz#2168082, rhbz#1986386
2023-04-20 10:16:49 +01:00
Laszlo Ersek
32f1dfd611 cope with kernel-core / kernel-modules-core subpkg split in RHEL-9.2 guests
resolves: rhbz#2184970
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2023-04-09 10:52:07 +02:00
Richard W.M. Jones
f1abc5da69 Remove warning when converting Rocky Linux
resolves: rhbz#2166618
Fix kernel panic after converting Rocky Linux 9
resolves: rhbz#2166619
2023-02-06 12:26:42 +00:00
Richard W.M. Jones
2587cc46a1 Remove -oo qemu-boot option completely
resolves: rhbz#2166565
2023-02-02 08:33:03 +00:00
Richard W.M. Jones
8f96179862 Enable debugging in basic tests
related: rhbz#2162332
2023-01-30 15:45:45 +00:00
Richard W.M. Jones
0d5af3e0fc Update for: -o kubevirt: Error if invalid guest name on target
resolves: rhbz#2162332
2023-01-30 09:52:55 +00:00
Richard W.M. Jones
f3ab056a8e -o kubevirt: Fix position of cpu field
resolves: rhbz#2162331

-o kubevirt: Fix incorrect error message
resolves: rhbz#2162441

-o kubevirt: Error if invalid guest name on target
resolves: rhbz#2162332

-o kubevirt: Enable -oo compressed option
resolves: rhbz#2162444
2023-01-20 10:46:07 +00:00
Richard W.M. Jones
ef9a918d7e Rebase to virt-v2v 2.2.0
resolves: rhbz#2135762

Include the BOCHS DRM driver in the initial ram disk
resolves: rhbz#2131123

windows_virtio: favor "fwcfg" over "qemufwcfg"
resolves: rhbz#2151752

-o rhv-upload: set ovirt:id correctly
resolves: rhbz#2152465

Enable the %check tests
2023-01-10 15:40:11 +00:00
Richard W.M. Jones
5eebd819d3 Copy drivers for Windows 11, Windows 2019 & Windows 2022
resolves: rhbz#2149811
Fix Description field for Windows >= 10 in -o rhv/vdsm modes
resolves: rhbz#2149863
Fix UEFI fallback boot loader if broken
resolves: rhbz#2149629
Document Windows system on Dynamic Disk is not supported (2140548)
Include the BOCHS DRM driver in the initial ram disk (2131123)

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
2022-12-05 09:51:09 +00:00
Laszlo Ersek
cc82339c1c Install qemu-ga package during conversion
Pick up upstream/rhel-9.1 7dd396af54df ("convert_linux: start the QEMU
guest agent in a distro-specific way", 2022-08-18).

Hoist the previous rhbz#2028764 section in the %changelog to the top.

resolves: rhbz#2028764
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2022-08-18 11:36:06 +02:00
Richard W.M. Jones
2dca36ed01 Remove LVM2 "devices file" during conversion
resolves: rhbz#2112801
Add support for Zstandard compressed kernel modules
resolves: rhbz#2116811
2022-08-10 09:05:41 +01:00
Laszlo Ersek
ef5fbb5721 input-xen: cover RHEL9 OpenSSL crypto settings
- Backport upstream ddab06d5eb99 [master] / 9e1c78a4dda8 [rhel-9.1].

- copy-patches.sh: rewrap patch formatting command, spell out "--patience"
  (already expected), then decrease churn by passing "--no-signature".

- Migrate earlier rhbz#2062360 %changelog entries to latest (=new) entry.

resolves: rhbz#2062360
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2022-07-29 15:27:37 +02:00
Laszlo Ersek
b6d936748a fix date format in %changelog
resolves: rhbz#2107503

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2022-07-28 16:59:02 +02:00
Laszlo Ersek
cb0feb7db4 relax qemu64 VCPU feature checking in the libvirt output
resolves: rhbz#2107503

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2022-07-25 15:28:25 +02:00
Richard W.M. Jones
3a13726152 Fix remapping of nvme devices in /boot/grub2/device.map
resolves: rhbz#2101665
Improve documentation of vmx+ssh and -ip option
resolves: rhbz#1854275
Remove legacy crypto advice and replace with targeted mechanism
resolves: rhbz#2062360
Fix race condition when unmounting in -o rhv mode (1953286#c26)
2022-07-15 15:48:54 +01:00
Richard W.M. Jones
0ab0657041 Rebase to stable branch version 2.0.7
resolves: rhbz#2059287
2022-07-06 17:29:45 +01:00
Richard W.M. Jones
b6cf325d1f Fix CVE-2022-2211 Denial of Service in --key parameter
resolves: rhbz#2102719
Add -oo compressed support
resolves: rhbz#2047660
Install qemu-ga package during conversion (2028764)
Limit the maximum of disks per guest
resolves: rhbz#2051564
Add support for LUKS encrypted guests using Clevis & Tang
resolves: rhbz#1809453
2022-07-05 12:06:39 +01:00
Richard W.M. Jones
05ecc1e30a Add Requires python3 / platform-python
resolves: rhbz#2094779

(cherry picked from commit 1180dbb912)
2022-06-08 20:47:59 +01:00
Richard W.M. Jones
297d84e622 Remove nbdkit-readahead-filter as it is no longer used
related: rhbz#2094779

(cherry picked from commit 76a47e52e4)
2022-06-08 20:47:59 +01:00
Richard W.M. Jones
2c8a2391cb Rebase to stable branch version 2.0.6
resolves: rhbz#2059287, rhbz#1658126, rhbz#1788823, rhbz#1854275

If listing RPM applications fails, rebuild DB and retry (2089623)
Document -i vmx -it ssh percent encoding in ssh URIs
resolves: rhbz#1938954
Document extra permissions needed for VMware 7 (1817050)
Remove osprober devices left around by grub2
resolves: rhbz#2003503
2022-05-26 14:29:40 +01:00
Richard W.M. Jones
6efd7f7327 Rebase to stable branch version 2.0.5
resolves: rhbz#2059287
Fix -o qemu warning
resolves: rhbz#2082603
2022-05-12 18:05:05 +01:00
Richard W.M. Jones
d529cb77d0 Rebase to stable branch version 2.0.4
Multiple fixes for -o qemu mode
resolves: rhbz#2074805
Work around blocking bug in OpenStack
resolves: rhbz#2074801
If multiple open-vm-tools packages are installed, remove all (2076436)
For -o rhv-upload wait for VM creation task
resolves: rhbz#1985830
For -i vmx add full support for SATA hard disks
resolves: rhbz#1883802
Fix booting of RHEL 9.1 guests after conversion
resolves: rhbz#2076013
2022-04-26 11:32:32 +01:00
Richard W.M. Jones
0a6d24c379 Rebase to stable branch version 2.0.3
Remove -o json mode
resolves: rhbz#2074026
Allow conversion of guests with NVMe drives from VMX files
resolves: rhbz#2070530
Cleanly reject guests with snapshots when using -it ssh
resolves: rhbz#1774386
Document that vmx+ssh "-ip" auth doesn't cover ssh / scp shell commands
resolves: rhbz#1854275
Fix conversion if swap partition isn't encrypted with root directory
resolves: rhbz#1658128
Document permissions when importing OVA using RHV UI
resolves: rhbz#2039597
2022-04-12 12:18:30 +01:00
Richard W.M. Jones
48c7f08e4f Rebase to stable branch version 2.0.2
resolves: rhbz#2059287
2022-04-04 13:54:07 +01:00
Richard W.M. Jones
855feb8b45 Rebase to stable branch version 2.0.1
Fix security issue when running virt-v2v as root
resolves: rhbz#2066773
2022-03-23 14:32:58 +00:00
Richard W.M. Jones
f4a3153f79 Fix openssh-clients dependency
resolves: rhbz#2064178
2022-03-15 08:55:59 +00:00
Richard W.M. Jones
75833be3e2 Rebase to stable branch version 2.0.0
resolves: rhbz#2059287, rhbz#1658126, rhbz#1788823, rhbz#1854275
2022-03-14 21:27:55 +00:00
Richard W.M. Jones
b4302313b9 -o rhv-upload: Improve conversion performance
resolves: rhbz#2039255
-o rhv-upload: Keep connections alive
resolves: rhbz#2032324
-o rhv-upload: Replace -oo rhv-direct with -oo rhv-proxy
resolves: rhbz#2033096
- Fix log line wrapping making log parsing difficult (1820221)
2022-02-15 18:48:46 +00:00
Richard W.M. Jones
991b284375 Rebase to upstream 1.45.98.
Add check for sufficient free space in the host
resolves: rhbz#2051394
Update documentation of -ip for conversions from VMware over HTTPS
related: rhbz#1960087
-o rhv-upload: Keep connections alive (2032324)
-o rhv-upload: Improve conversion performance (2039255)
2022-02-10 19:59:40 +00:00
Laszlo Ersek
4b8820ac0b fix rhbz#1960087, rhbz#2043333
v2v import from vCenter fails when using interactive password because
cookie-script tries to be interactive (pick commit 8abc07a8589a)
resolves: rhbz#1960087

model='virtio-transitional' is wrongly added when converting windows guest
to local by rhel9 v2v (pick commit range commit range
8abc07a8589a..cacedec64072)
resolves: rhbz#2043333

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2022-02-02 14:44:36 +01:00
Richard W.M. Jones
04a560e699 Fix hang when converting with virt-p2v
resolves: rhbz#2044911
Send nbdinfo debugging information to stderr
resolves: rhbz#2044922
Explicitly require platform-python
resolves: rhbz#2046178
2022-01-26 13:08:10 +00:00
Richard W.M. Jones
211690d47b Fix virt-v2v hang when given incorrect vpx:// URL
resolves: rhbz#2041886
2022-01-20 12:46:20 +00:00
Richard W.M. Jones
7c71720a7f Rebase to upstream 1.45.97.
resolves: rhbz#2011713
Fix -o rhv mode
resolves: rhbz#2027598
input: xen: Fix assertion error when importing from remote block device
resolves: rhbz#2041852
output: -o json: Allow -oo (output options) to work
resolves: rhbz#2041850
2022-01-18 21:35:54 +00:00
Richard W.M. Jones
c553c74d10 Rebase to upstream 1.45.96.
resolves: rhbz#2011713
Add virtio-transitional for older guests when converting to q35
resolves: rhbz#1942325
2022-01-07 12:09:57 +00:00
Laszlo Ersek
7ea0c8cf97 output_rhv: restrict block status collection to the old RHV output
resolves: rhbz#2034240
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2021-12-23 15:34:38 +01:00
Laszlo Ersek
8c9ce53762 copy-patches: further git setup masking
- Re-set the subject prefix to just "PATCH".
- core.abbrev=8

resolves: rhbz#2034240
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2021-12-23 15:34:19 +01:00
Laszlo Ersek
1e9c9bbe05 copy-patches: mask some differences in Laszlo's git setup
Restore these git defaults:
- core.abbrev=9
- -O/dev/null

Taken from libguestfs dist-git commit 975798ac9b5e.

resolves: rhbz#2034240
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2021-12-23 15:23:16 +01:00
Richard W.M. Jones
8190ec8540 Include a few experimental non-upstream patches
These two patches fix potential issues.  Best to get them tested over
Christmas and New Year.

    v2v: Swap over the output and conversion stages

    In old virt-v2v, we did (approximately, since the steps were not as
    clear):

      Input -> Convert -> Output -> Copy -> Finalize

    After modularizing virt-v2v we changed this to:

      Input -> Output -> Convert -> Copy -> Finalize

    However this has a (sort of) problem.  For -o rhv-upload when we start
    the nbdkit rhv-upload-plugin machinery, it obtains a time-limited
    ticket from imageio.  This ticket could expire if the conversion step
    takes longer than a certain time (60 seconds by default, may be
    increased in a future version of oVirt).

    I believe this is really a problem in imageio or that the
    rhv-upload-plugin should really renew this ticket automatically, but
    it does not, instead failing.  (The ticket *is* renewed automatically
    whenever a request is sent to imageio, but in this case no requests
    are being sent).

    Anyway the easiest thing is to switch the ordering back to how it was
    in old virt-v2v (at top).  It doesn't make a difference for any other
    output modes.

    Reported-by: Nir Soffer

and:

    v2v: Remove nbdcopy --request-size=4M flag

    This was added when we were setting the cow-block-size to 1M.  However
    since commit 351d61f768 ("input: -it vddk: Reduce cow-block-size to 4K")
    we stopped doing that so this is no longer needed.

    Reverts: commit 08e764959ec9dadd71a95d22d3d88d647a18d165

Related: rhbz#2011713
2021-12-18 13:51:11 +00:00
Richard W.M. Jones
7f5895afd1 Rebase to upstream 1.45.95.
- Fix q35 error "IDE controllers are unsupported"
- Add virt-v2v and libvirt version in debug output
- Fix -o rhv output mode showing no guests listed
  resolves: rhbz#1637857, rhbz#2032112, rhbz#2027598
2021-12-18 11:34:28 +00:00
Laszlo Ersek
818a2d3d6a copy-patches.sh: update Laszlo's local username on his laptop
For reasons better not explained, Laszlo's local username on his laptop is
not "lersek" but "lacos".

related: rhbz#2011713

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
2021-12-13 16:15:53 +01:00
Richard W.M. Jones
db9d8a6e4c Revert "output: Don't use nbdkit-file-plugin cache=none when writing"
Backport the following upstream commit:
5d5383b912

Require nbdkit >= 1.28.3-2.el9 since that contains the associated
optimization to write eviction in the file plugin:

a956e2e75d

related: rhbz#2011713
2021-12-08 11:26:09 +00:00
Richard W.M. Jones
94cf9be0f8 Don't use nbdkit-file-plugin cache=none when writing
Further performance fix for https://bugzilla.redhat.com/2011713

related: rhbz#2011713
2021-12-07 13:48:05 +00:00