v4l2-compliance: Add an option to override the driver name
PATCH 1/1 v4l2-compliance: Add an option to override the driver name
When using the virtio-media driver, the host and a guest VM are used, with the guest VM proxying requests to a host device. The driver name in the guest VM is reported as "virtio-media", when really its proxying requests to a driver with a different name (for example, "uvcvideo"). For the test to pass, v4l2-compliance needs to know the driver name of the device on the host because it changes its behavior depending on the driver under test.
With this new option, the name of the host driver can be passed in on the command line so the test running in the guest can adapt accordingly.
--- utils/v4l2-compliance/v4l2-compliance.cpp | 17 +++++++++++++++++ utils/v4l2-compliance/v4l2-compliance.h | 15 ++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-)
utils/v4l2-compliance/v4l2-compliance.cpp +17 -0
@@ -52,6 +52,7 @@ enum Option { OptHelp = 'h', OptSetMediaDevice = 'm', OptSetMediaDeviceOnly = 'M', + OptDriverName = 'N', OptNoWarnings = 'n', OptNoProgress = 'P', OptSetRadioDevice = 'r',
@@ -87,6 +88,7 @@ bool exit_on_warn; bool is_vivid; bool is_uvcvideo; int media_fd = -1; +std::string override_driver_name; unsigned warnings; bool has_mmu = true;
@@ -130,6 +132,7 @@ static struct option long_options[] = { {"help", no_argument, nullptr, OptHelp}, {"verbose", no_argument, nullptr, OptVerbose}, {"color", required_argument, nullptr, OptColor}, + {"driver-name", required_argument, nullptr, OptDriverName}, {"no-warnings", no_argument, nullptr, OptNoWarnings}, {"no-progress", no_argument, nullptr, OptNoProgress}, {"exit-on-fail", no_argument, nullptr, OptExitOnFail},
@@ -255,6 +258,8 @@ static void usage() printf(" then this defaults to 90%%.\n"); printf(" -E, --exit-on-fail Exit on the first fail.\n"); printf(" -h, --help Display this help message.\n"); + printf(" -N, --driver-name <name>\n"); + printf(" Override driver name with <name>.\n"); printf(" -C, --color <when> Highlight OK/warn/fail/FAIL strings with colors\n"); printf(" <when> can be set to always, never, or auto (the default)\n"); printf(" -n, --no-warnings Turn off warning messages.\n");
@@ -1026,6 +1031,15 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ printf("Compliance test for device "); else printf("Compliance test for %s device ", driver.c_str()); + + struct v4l2_capability real_vcap; + node.querycap(real_vcap); + + std::string real_vcap_driver = reinterpret_cast<const char *>(real_vcap.driver); + if (driver != real_vcap_driver) { + printf("(overridden from %s) ", real_vcap_driver.c_str()); + } + printf("%s%s:\n\n", node.device, node.g_direct() ? "" : " (using libv4l2)"); if (node.g_caps() & (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE |
@@ -1811,6 +1825,9 @@ int main(int argc, char **argv) } } break; + case OptDriverName: + override_driver_name = optarg; + break; case OptColor: if (!strcmp(optarg, "always")) show_colors = true;
utils/v4l2-compliance/v4l2-compliance.h +14 -1
@@ -311,7 +311,20 @@ static inline double fract2f(const struct v4l2_fract *f)return (double )f->numerator / (double )f->denominator; } -#define doioctl (n, r, p) v4l_named_ioctl((n)->g_v4l_fd(), #r, r, p) +extern std::string override_driver_name; + +inline int wrapped_doioctl (struct node *n,const char *name,unsigned long cmd,void *arg) +{ +int retval =v4l_named_ioctl (n->g_v4l_fd (), name, cmd, arg); +if (retval ==0 && cmd ==VIDIOC_QUERYCAP && arg !=nullptr && !override_driver_name.empty ()) { +struct v4l2_capability *cap = (struct v4l2_capability *)arg; +strncpy ((char *)cap->driver, override_driver_name.c_str (),sizeof (cap->driver) -1 ); + cap->driver[sizeof (cap->driver) -1 ] ='\0' ; + } +return retval; +} + +#define doioctl (n, r, p) wrapped_doioctl(n, #r, r, p)const char *ok (int res);int check_string (const char *s,size_t len);
base-commit: f2a3cb8a59bcce9ac9f7a7c5b71429610d638a12
Signature · 1 line
2.54.0.794.g4f17f83d09-goog
CCing some more people to hopefully start the discussion. Thanks!
Quoted 113 lines · Brian Daniels
When using the virtio-media driver, the host and a guest VM are used, with the guest VM proxying requests to a host device. The driver name in the guest VM is reported as "virtio-media", when really its proxying requests to a driver with a different name (for example, "uvcvideo"). For the test to pass, v4l2-compliance needs to know the driver name of the device on the host because it changes its behavior depending on the driver under test.
With this new option, the name of the host driver can be passed in on the command line so the test running in the guest can adapt accordingly.
Assisted-by Gemini CLI:gemini-3.1-proSigned-off-by Brian Daniels <[email protected]>--- utils/v4l2-compliance/v4l2-compliance.cpp | 17 +++++++++++++++++ utils/v4l2-compliance/v4l2-compliance.h | 15 ++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-)utils/v4l2-compliance/v4l2-compliance.cpp +17
-0@@ -52,6 +52,7 @@ enum Option { OptHelp = 'h', OptSetMediaDevice = 'm', OptSetMediaDeviceOnly = 'M', + OptDriverName = 'N', OptNoWarnings = 'n', OptNoProgress = 'P', OptSetRadioDevice = 'r',@@ -87,6 +88,7 @@ bool exit_on_warn; bool is_vivid; bool is_uvcvideo; int media_fd = -1; +std::string override_driver_name; unsigned warnings; bool has_mmu = true;@@ -130,6 +132,7 @@ static struct option long_options[] = { {"help", no_argument, nullptr, OptHelp}, {"verbose", no_argument, nullptr, OptVerbose}, {"color", required_argument, nullptr, OptColor}, + {"driver-name", required_argument, nullptr, OptDriverName}, {"no-warnings", no_argument, nullptr, OptNoWarnings}, {"no-progress", no_argument, nullptr, OptNoProgress}, {"exit-on-fail", no_argument, nullptr, OptExitOnFail},@@ -255,6 +258,8 @@ static void usage() printf(" then this defaults to 90%%.\n"); printf(" -E, --exit-on-fail Exit on the first fail.\n"); printf(" -h, --help Display this help message.\n"); + printf(" -N, --driver-name <name>\n"); + printf(" Override driver name with <name>.\n"); printf(" -C, --color <when> Highlight OK/warn/fail/FAIL strings with colors\n"); printf(" <when> can be set to always, never, or auto (the default)\n"); printf(" -n, --no-warnings Turn off warning messages.\n");@@ -1026,6 +1031,15 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ printf("Compliance test for device "); else printf("Compliance test for %s device ", driver.c_str()); + + struct v4l2_capability real_vcap; + node.querycap(real_vcap); + + std::string real_vcap_driver = reinterpret_cast<const char *>(real_vcap.driver); + if (driver != real_vcap_driver) { + printf("(overridden from %s) ", real_vcap_driver.c_str()); + } + printf("%s%s:\n\n", node.device, node.g_direct() ? "" : " (using libv4l2)"); if (node.g_caps() & (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE |@@ -1811,6 +1825,9 @@ int main(int argc, char **argv) } } break; + case OptDriverName: + override_driver_name = optarg; + break; case OptColor: if (!strcmp(optarg, "always")) show_colors = true;utils/v4l2-compliance/v4l2-compliance.h +14
-1@@ -311,7 +311,20 @@ static inline double fract2f(const struct v4l2_fract *f)return (double )f->numerator / (double )f->denominator; } -#define doioctl (n, r, p) v4l_named_ioctl((n)->g_v4l_fd(), #r, r, p) +extern std::string override_driver_name; + +inline int wrapped_doioctl (struct node *n,const char *name,unsigned long cmd,void *arg) +{ +int retval =v4l_named_ioctl (n->g_v4l_fd (), name, cmd, arg); +if (retval ==0 && cmd ==VIDIOC_QUERYCAP && arg !=nullptr && !override_driver_name.empty ()) { +struct v4l2_capability *cap = (struct v4l2_capability *)arg; +strncpy ((char *)cap->driver, override_driver_name.c_str (),sizeof (cap->driver) -1 ); + cap->driver[sizeof (cap->driver) -1 ] ='\0' ; + } +return retval; +} + +#define doioctl (n, r, p) wrapped_doioctl(n, #r, r, p)const char *ok (int res);int check_string (const char *s,size_t len);base-commit:
f2a3cb8a59bcce9ac9f7a7c5b71429610d638a12--
2.54.0.794.g4f17f83d09-goog
Hi Brian,
Apologies for the delay, it's been very busy and v4l-utils patches are low priority.
Quoted 93 lines · Brian Daniels
CCing some more people to hopefully start the discussion. Thanks!
Quoted 90 lines · Brian Daniels
When using the virtio-media driver, the host and a guest VM are used, with the guest VM proxying requests to a host device. The driver name in the guest VM is reported as "virtio-media", when really its proxying requests to a driver with a different name (for example, "uvcvideo"). For the test to pass, v4l2-compliance needs to know the driver name of the device on the host because it changes its behavior depending on the driver under test.
With this new option, the name of the host driver can be passed in on the command line so the test running in the guest can adapt accordingly.
Assisted-by Gemini CLI:gemini-3.1-proSigned-off-by Brian Daniels <[email protected]>--- utils/v4l2-compliance/v4l2-compliance.cpp | 17 +++++++++++++++++ utils/v4l2-compliance/v4l2-compliance.h | 15 ++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-)utils/v4l2-compliance/v4l2-compliance.cpp +17
-0@@ -52,6 +52,7 @@ enum Option { OptHelp = 'h', OptSetMediaDevice = 'm', OptSetMediaDeviceOnly = 'M', + OptDriverName = 'N', OptNoWarnings = 'n', OptNoProgress = 'P', OptSetRadioDevice = 'r',@@ -87,6 +88,7 @@ bool exit_on_warn; bool is_vivid; bool is_uvcvideo; int media_fd = -1; +std::string override_driver_name; unsigned warnings; bool has_mmu = true;@@ -130,6 +132,7 @@ static struct option long_options[] = { {"help", no_argument, nullptr, OptHelp}, {"verbose", no_argument, nullptr, OptVerbose}, {"color", required_argument, nullptr, OptColor}, + {"driver-name", required_argument, nullptr, OptDriverName}, {"no-warnings", no_argument, nullptr, OptNoWarnings}, {"no-progress", no_argument, nullptr, OptNoProgress}, {"exit-on-fail", no_argument, nullptr, OptExitOnFail},@@ -255,6 +258,8 @@ static void usage() printf(" then this defaults to 90%%.\n"); printf(" -E, --exit-on-fail Exit on the first fail.\n"); printf(" -h, --help Display this help message.\n"); + printf(" -N, --driver-name <name>\n"); + printf(" Override driver name with <name>.\n"); printf(" -C, --color <when> Highlight OK/warn/fail/FAIL strings with colors\n"); printf(" <when> can be set to always, never, or auto (the default)\n"); printf(" -n, --no-warnings Turn off warning messages.\n");@@ -1026,6 +1031,15 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ printf("Compliance test for device "); else printf("Compliance test for %s device ", driver.c_str()); + + struct v4l2_capability real_vcap; + node.querycap(real_vcap); + + std::string real_vcap_driver = reinterpret_cast<const char *>(real_vcap.driver); + if (driver != real_vcap_driver) { + printf("(overridden from %s) ", real_vcap_driver.c_str()); + } + printf("%s%s:\n\n", node.device, node.g_direct() ? "" : " (using libv4l2)"); if (node.g_caps() & (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE |@@ -1811,6 +1825,9 @@ int main(int argc, char **argv) } } break; + case OptDriverName: + override_driver_name = optarg; + break; case OptColor: if (!strcmp(optarg, "always")) show_colors = true;utils/v4l2-compliance/v4l2-compliance.h +0
-0@@ -311,7 +311,20 @@ static inline double fract2f(const struct v4l2_fract *f)return (double )f->numerator / (double )f->denominator; }
Quoted 15 lines
Quoted 5 lines
utils/v4l2-compliance/v4l2-compliance.h +4
-1-#define doioctl (n, r, p) v4l_named_ioctl((n)->g_v4l_fd(), #r, r, p) +extern std::string override_driver_name; + +inline int wrapped_doioctl (struct node *n,const char *name,unsigned long cmd,void *arg) +{utils/v4l2-compliance/v4l2-compliance.h static inline double fract2f(const struct v4l2_fract *f) · line 327
Quoted 10 lines
utils/v4l2-compliance/v4l2-compliance.h +10
-0+int retval =v4l_named_ioctl (n->g_v4l_fd (), name, cmd, arg); +if (retval ==0 && cmd ==VIDIOC_QUERYCAP && arg !=nullptr && !override_driver_name.empty ()) { +struct v4l2_capability *cap = (struct v4l2_capability *)arg; +strncpy ((char *)cap->driver, override_driver_name.c_str (),sizeof (cap->driver) -1 ); + cap->driver[sizeof (cap->driver) -1 ] ='\0' ; + } +return retval; +} + +#define doioctl (n, r, p) wrapped_doioctl(n, #r, r, p)
Ah, this I don't like. There really is just one place where the driver name is checked to modify v4l2-compliance behavior (the start of testNode()), and that's where this override_driver_name should be used.
Hiding it in this macro is not nice.
Thinking it over, it might be better to just introduce two option: --is-vivid and --is-uvcvideo instead of hacking the driver name. If provided, then v4l2-compliance should just act as if it was a vivid/uvcvideo driver. Those are the only two special cases at the moment.
Regards,
Hans
Quoted 9 lines
Quoted 8 lines
utils/v4l2-compliance/v4l2-compliance.h +0
-0const char *ok (int res);int check_string (const char *s,size_t len);base-commit:
f2a3cb8a59bcce9ac9f7a7c5b71429610d638a12--
2.54.0.794.g4f17f83d09-goog
Hi Hans,
Sorry for my late reply, appreciate the feedback! I've implemented your suggestion in a v2:
https://lore.kernel.org/all/[email protected]/
Thanks,
Brian
Quoted 140 lines · On Wed, Sep 9, 2026 at 10:28 AM <[email protected]> wrote:
Hi Brian,
Apologies for the delay, it's been very busy and v4l-utils patches are low priority.
Quoted 93 lines · Brian Daniels
CCing some more people to hopefully start the discussion. Thanks!
Quoted 90 lines · Brian Daniels
When using the virtio-media driver, the host and a guest VM are used, with the guest VM proxying requests to a host device. The driver name in the guest VM is reported as "virtio-media", when really its proxying requests to a driver with a different name (for example, "uvcvideo"). For the test to pass, v4l2-compliance needs to know the driver name of the device on the host because it changes its behavior depending on the driver under test.
With this new option, the name of the host driver can be passed in on the command line so the test running in the guest can adapt accordingly.
Assisted-by Gemini CLI:gemini-3.1-proSigned-off-by Brian Daniels <[email protected]>--- utils/v4l2-compliance/v4l2-compliance.cpp | 17 +++++++++++++++++ utils/v4l2-compliance/v4l2-compliance.h | 15 ++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-)utils/v4l2-compliance/v4l2-compliance.cpp +17
-0@@ -52,6 +52,7 @@ enum Option { OptHelp = 'h', OptSetMediaDevice = 'm', OptSetMediaDeviceOnly = 'M', + OptDriverName = 'N', OptNoWarnings = 'n', OptNoProgress = 'P', OptSetRadioDevice = 'r',@@ -87,6 +88,7 @@ bool exit_on_warn; bool is_vivid; bool is_uvcvideo; int media_fd = -1; +std::string override_driver_name; unsigned warnings; bool has_mmu = true;@@ -130,6 +132,7 @@ static struct option long_options[] = { {"help", no_argument, nullptr, OptHelp}, {"verbose", no_argument, nullptr, OptVerbose}, {"color", required_argument, nullptr, OptColor}, + {"driver-name", required_argument, nullptr, OptDriverName}, {"no-warnings", no_argument, nullptr, OptNoWarnings}, {"no-progress", no_argument, nullptr, OptNoProgress}, {"exit-on-fail", no_argument, nullptr, OptExitOnFail},@@ -255,6 +258,8 @@ static void usage() printf(" then this defaults to 90%%.\n"); printf(" -E, --exit-on-fail Exit on the first fail.\n"); printf(" -h, --help Display this help message.\n"); + printf(" -N, --driver-name <name>\n"); + printf(" Override driver name with <name>.\n"); printf(" -C, --color <when> Highlight OK/warn/fail/FAIL strings with colors\n"); printf(" <when> can be set to always, never, or auto (the default)\n"); printf(" -n, --no-warnings Turn off warning messages.\n");@@ -1026,6 +1031,15 @@ void testNode(struct node &node, struct node &node_m2m_cap, struct node &expbuf_ printf("Compliance test for device "); else printf("Compliance test for %s device ", driver.c_str()); + + struct v4l2_capability real_vcap; + node.querycap(real_vcap); + + std::string real_vcap_driver = reinterpret_cast<const char *>(real_vcap.driver); + if (driver != real_vcap_driver) { + printf("(overridden from %s) ", real_vcap_driver.c_str()); + } + printf("%s%s:\n\n", node.device, node.g_direct() ? "" : " (using libv4l2)"); if (node.g_caps() & (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VBI_CAPTURE |@@ -1811,6 +1825,9 @@ int main(int argc, char **argv) } } break; + case OptDriverName: + override_driver_name = optarg; + break; case OptColor: if (!strcmp(optarg, "always")) show_colors = true;utils/v4l2-compliance/v4l2-compliance.h +0
-0@@ -311,7 +311,20 @@ static inline double fract2f(const struct v4l2_fract *f)return (double )f->numerator / (double )f->denominator; }Quoted 15 lines
Quoted 5 lines
utils/v4l2-compliance/v4l2-compliance.h +4
-1-#define doioctl (n, r, p) v4l_named_ioctl((n)->g_v4l_fd(), #r, r, p) +extern std::string override_driver_name; + +inline int wrapped_doioctl (struct node *n,const char *name,unsigned long cmd,void *arg) +{utils/v4l2-compliance/v4l2-compliance.h static inline double fract2f(const struct v4l2_fract *f) · line 327
Quoted 10 lines
utils/v4l2-compliance/v4l2-compliance.h +10
-0+int retval =v4l_named_ioctl (n->g_v4l_fd (), name, cmd, arg); +if (retval ==0 && cmd ==VIDIOC_QUERYCAP && arg !=nullptr && !override_driver_name.empty ()) { +struct v4l2_capability *cap = (struct v4l2_capability *)arg; +strncpy ((char *)cap->driver, override_driver_name.c_str (),sizeof (cap->driver) -1 ); + cap->driver[sizeof (cap->driver) -1 ] ='\0' ; + } +return retval; +} + +#define doioctl (n, r, p) wrapped_doioctl(n, #r, r, p)Ah, this I don't like. There really is just one place where the driver name is checked to modify v4l2-compliance behavior (the start of
testNode()), and that's where thisoverride_driver_nameshould be used.Hiding it in this macro is not nice.
Thinking it over, it might be better to just introduce two option: --is-vivid and --is-uvcvideo instead of hacking the driver name. If provided, then v4l2-compliance should just act as if it was a vivid/uvcvideo driver. Those are the only two special cases at the moment.
Regards,
Hans
Quoted 9 lines
Quoted 8 lines
utils/v4l2-compliance/v4l2-compliance.h +0
-0const char *ok (int res);int check_string (const char *s,size_t len);base-commit:
f2a3cb8a59bcce9ac9f7a7c5b71429610d638a12--
2.54.0.794.g4f17f83d09-goog