From: Jing Luo via pve-devel <pve-devel@lists.proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Jing Luo <jing@jing.rocks>
Subject: [pve-devel] [PATCH v2 pve-qemu-kvm] patches: pbs block driver: correct a data type
Date: Mon, 10 Jun 2024 21:05:26 +0900 [thread overview]
Message-ID: <mailman.547.1718103401.319.pve-devel@lists.proxmox.com> (raw)
In-Reply-To: <94ed3b8c-20bf-4832-9ee8-f5b74e7b55f6@proxmox.com>
[-- Attachment #1: Type: message/rfc822, Size: 7644 bytes --]
From: Jing Luo <jing@jing.rocks>
To: pve-devel@lists.proxmox.com
Cc: f.ebner@proxmox.com, Jing Luo <jing@jing.rocks>
Subject: [PATCH v2 pve-qemu-kvm] patches: pbs block driver: correct a data type
Date: Mon, 10 Jun 2024 21:05:26 +0900
Message-ID: <20240610122909.1216178-2-jing@jing.rocks>
gcc warns (-Werror=type-limits) that it will always be false for the
if statement. This is because here s->aid is defined as char, while
proxmox_restore_open_image() returns an int.
This is probably because chars are treated as unsigned on arm arch but
signed on x86 arch:
https://developer.arm.com/documentation/den0013/d/Porting/Miscellaneous-C-porting-issues/unsigned-char-and-signed-char
Signed-off-by: Jing Luo <jing@jing.rocks>
--
[changes since v1]
Use uint8_t for s->aid. Check the returned value from
proxmox_restore_open_image(), then assign it to s->aid.
Fiona: the doctor found no fish bone in my throat (probably swallowed),
so here's my best try :) I did minimal testing (it built).
I also found that chars are unsigned on riscv64, powerpc64le...not that
proxomx needs to worry about those arch though.
---
...ock-driver-to-map-backup-archives-into.patch | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch b/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
index b9578ba..4c155c8 100644
--- a/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
+++ b/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
@@ -15,11 +15,11 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
block/meson.build | 2 +
- block/pbs.c | 307 +++++++++++++++++++++++++++++++++++++++++++
+ block/pbs.c | 310 +++++++++++++++++++++++++++++++++++++++++++
meson.build | 2 +-
qapi/block-core.json | 29 ++++
qapi/pragma.json | 1 +
- 5 files changed, 340 insertions(+), 1 deletion(-)
+ 5 files changed, 343 insertions(+), 1 deletion(-)
create mode 100644 block/pbs.c
diff --git a/block/meson.build b/block/meson.build
@@ -37,10 +37,10 @@ index 6bba803f94..1945e04eeb 100644
system_ss.add(files('block-ram-registrar.c'))
diff --git a/block/pbs.c b/block/pbs.c
new file mode 100644
-index 0000000000..dd72356bd3
+index 0000000000..9112d4dfe6
--- /dev/null
+++ b/block/pbs.c
-@@ -0,0 +1,307 @@
+@@ -0,0 +1,310 @@
+/*
+ * Proxmox Backup Server read-only block driver
+ */
@@ -68,7 +68,7 @@ index 0000000000..dd72356bd3
+
+typedef struct {
+ ProxmoxRestoreHandle *conn;
-+ char aid;
++ uint8_t aid;
+ int64_t length;
+
+ char *repository;
@@ -201,12 +201,15 @@ index 0000000000..dd72356bd3
+ }
+
+ /* acquire handle and length */
-+ s->aid = proxmox_restore_open_image(s->conn, s->archive, &pbs_error);
-+ if (s->aid < 0) {
++ ret = proxmox_restore_open_image(s->conn, s->archive, &pbs_error);
++ if (ret < 0 || ret > UINT8_MAX) {
+ if (pbs_error && errp) error_setg(errp, "PBS open_image failed: %s", pbs_error);
+ if (pbs_error) proxmox_backup_free_error(pbs_error);
+ return -ENODEV;
++ } else {
++ s->aid = ret;
+ }
++
+ s->length = proxmox_restore_get_image_length(s->conn, s->aid, &pbs_error);
+ if (s->length < 0) {
+ if (pbs_error && errp) error_setg(errp, "PBS get_image_length failed: %s", pbs_error);
--
2.45.2
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-06-11 10:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240607094734.3883693-1-jing@jing.rocks>
2024-06-07 11:49 ` [pve-devel] [PATCH pve-qemu-kvm] patch: " Fiona Ebner
2024-06-10 1:48 ` Jing Luo via pve-devel
[not found] ` <57a95560b7c8bce55d2e8270d18d9778@jing.rocks>
2024-06-10 9:27 ` Fiona Ebner
2024-06-10 12:05 ` Jing Luo via pve-devel [this message]
[not found] ` <20240610122909.1216178-2-jing@jing.rocks>
2024-06-10 14:12 ` [pve-devel] applied: [PATCH v2 pve-qemu-kvm] patches: " Fiona Ebner
2024-06-10 8:53 ` [pve-devel] [PATCH pve-qemu-kvm] patch: " Shannon Sterz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=mailman.547.1718103401.319.pve-devel@lists.proxmox.com \
--to=pve-devel@lists.proxmox.com \
--cc=jing@jing.rocks \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal