6c478a495d
- kvm-blkdebug-Add-delay-ns-option.patch [RHEL-121686] - kvm-block-Add-blk_co_start-end_request-and-BDRV_REQ_NO_Q.patch [RHEL-121686] - kvm-block-Add-flags-parameter-to-blk_-_pdiscard.patch [RHEL-121686] - kvm-ide-Minimal-fix-for-deadlock-between-TRIM-and-drain.patch [RHEL-121686] - kvm-ide-Clean-up-ide_trim_co_entry-to-be-idiomatic-corou.patch [RHEL-121686] - kvm-ide-test-Factor-out-wait_dma_completion.patch [RHEL-121686] - kvm-ide-test-Test-reset-during-TRIM.patch [RHEL-121686] - kvm-block-graph-lock-fix-missed-wakeup-in-bdrv_graph_co_.patch [RHEL-186384] - kvm-block-curl-fix-curl-internal-handles-handling.patch [RHEL-186384] - kvm-block-curl.c-Use-explicit-long-constants-in-curl_eas.patch [RHEL-186384] - kvm-block-curl.c-Fix-CURLOPT_VERBOSE-parameter-type.patch [RHEL-186384] - kvm-block-curl-fix-concurrent-completion-handling.patch [RHEL-186384] - kvm-block-curl-free-s-password-in-cleanup-paths.patch [RHEL-186384] - kvm-nvme-Kick-and-check-completions-in-BDS-context.patch [RHEL-186384] - kvm-nvme-Note-in-which-AioContext-some-functions-run.patch [RHEL-186384] - kvm-block-remove-detached-header-option-from-opts-after-.patch [RHEL-186384] - kvm-block-fix-luks-amend-when-run-in-coroutine.patch [RHEL-186384] - kvm-qed-Don-t-try-to-flush-during-incoming-migration.patch [RHEL-186384] - kvm-block-vmdk-fix-OOB-read-in-vmdk_read_extent.patch [RHEL-186384] - kvm-block-throttle-groups-fix-deadlock-with-iolimits-and.patch [RHEL-186384] - kvm-throttle-group-Fix-race-condition-in-throttle_group_.patch [RHEL-186384] - kvm-qemu-img-Fix-amend-option-parse-error-handling.patch [RHEL-186384] - kvm-qemu-img-rebase-don-t-exceed-IO_BUF_SIZE-in-one-oper.patch [RHEL-186384] - kvm-python-backport-drop-Python3.6-workarounds.patch [RHEL-186384] - kvm-python-backport-Remove-deprecated-get_event_loop-cal.patch [RHEL-186384] - kvm-python-backport-avoid-creating-additional-event-loop.patch [RHEL-186384] - kvm-iotests-147-ensure-temporary-sockets-are-closed-befo.patch [RHEL-186384] - kvm-iotests-151-ensure-subprocesses-are-cleaned-up.patch [RHEL-186384] - kvm-tests-qemu-iotest-fix-iotest-024-with-qed-images.patch [RHEL-186384] - kvm-tests-qemu-iotests-Fix-check-for-existing-file-in-_r.patch [RHEL-186384] - kvm-async-access-bottom-half-flags-with-qatomic_read.patch [RHEL-186384] - kvm-block-linux-aio-bound-ioq_submit-recursion-depth.patch [RHEL-186384] - kvm-block-io-fallback-to-bounce-buffer-if-BLKZEROOUT-is-.patch [RHEL-186384] - kvm-file-posix-populate-pwrite_zeroes_alignment.patch [RHEL-186384] - kvm-block-use-pwrite_zeroes_alignment-when-writing-first.patch [RHEL-186384] - kvm-iotests-add-Linux-loop-device-image-creation-test.patch [RHEL-186384] - kvm-virtio-Fix-crash-when-sriov-pf-is-set-for-non-PCI-Ex.patch [RHEL-186384] - kvm-virtio-scsi-pass-the-same-cdb_size-to-virtio_scsi_po.patch [RHEL-186384] - kvm-hw-scsi-avoid-deadlock-upon-TMF-request-cancelling-w.patch [RHEL-186384] - kvm-virtio-blk-fix-zone-report-buffer-out-of-memory-CVE-.patch [RHEL-186384] - kvm-ide-Fix-potential-assertion-failure-on-VM-stop-for-P.patch [RHEL-186384] - kvm-block-Create-DEFAULT_BLOCK_CONF-macro.patch [RHEL-186384] - kvm-block-Add-more-defaults-to-DEFAULT_BLOCK_CONF.patch [RHEL-186384] - kvm-block-mirror-check-range-when-setting-zero-bitmap-fo.patch [RHEL-186384] - kvm-iotests-test-active-mirror-with-unaligned-small-writ.patch [RHEL-186384] - kvm-block-mirror-fix-assertion-failure-upon-duplicate-co.patch [RHEL-186384] - kvm-commit-Drain-nodes-across-all-of-bdrv_commit.patch [RHEL-186384] - kvm-qemu-io-Add-aio_discard-command.patch [RHEL-186384] - kvm-qcow2-Fix-corruption-on-discard-during-write-with-CO.patch [RHEL-186384] - kvm-iotests-046-Test-that-discard-write_zeroes-wait-for-.patch [RHEL-186384] - kvm-qcow2-Fix-data-loss-on-zero-write-with-detect-zeroes.patch [RHEL-186384] - kvm-block-Fix-crash-after-setting-latency-historygram-wi.patch [RHEL-186384] - Resolves: RHEL-121686 (qemu-kvm hung during drain after double pause) - Resolves: RHEL-186384 (virt-storage: Backport stable branch fixes)
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From e3921ea32fdc43a74a639e215a861e464ec3da80 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Mon, 13 Oct 2025 13:41:19 +0100
|
|
Subject: [PATCH 11/52] block/curl.c: Fix CURLOPT_VERBOSE parameter type
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
RH-MergeRequest: 504: virt-storage: Backport stable branch fixes
|
|
RH-Jira: RHEL-186384
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [4/45] 7adffe8d6de2464ed632918f3d8b4200ada1f2a0 (kmwolf/centos-qemu-kvm)
|
|
|
|
In commit ed26056d90 ("block/curl.c: Use explicit long constants in
|
|
curl_easy_setopt calls") we missed a further call that takes a long
|
|
parameter.
|
|
|
|
Reported-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
|
|
Message-ID: <20251013124127.604401-1-rjones@redhat.com>
|
|
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit ad97769e9dcf4dbdaae6d859176e5f37fd6a7c66)
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
block/curl.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/block/curl.c b/block/curl.c
|
|
index bbe891dafb..96498aac1d 100644
|
|
--- a/block/curl.c
|
|
+++ b/block/curl.c
|
|
@@ -538,7 +538,7 @@ static int curl_init_state(BDRVCURLState *s, CURLState *state)
|
|
#endif
|
|
|
|
#ifdef DEBUG_VERBOSE
|
|
- if (curl_easy_setopt(state->curl, CURLOPT_VERBOSE, 1)) {
|
|
+ if (curl_easy_setopt(state->curl, CURLOPT_VERBOSE, 1L)) {
|
|
goto err;
|
|
}
|
|
#endif
|
|
--
|
|
2.52.0
|
|
|