Page MenuHomeFreeBSD
Files F106956327

D42692.diff
No OneTemporary
Actions

D42692.diff
View Options

diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8
--- a/usr.sbin/bhyve/bhyve.8
+++ b/usr.sbin/bhyve/bhyve.8
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd November 20, 2023
+.Dd December 29, 2023
.Dt BHYVE 8
.Os
.Sh NAME
@@ -778,7 +778,7 @@
A display resolution, width and height, respectively.
If not specified, a default resolution of 1024x768 pixels will be used.
Minimal supported resolution is 640x480 pixels,
-and maximum is 1920x1200 pixels.
+and maximum is 3840x2160 pixels.
.It Cm vga= Ns Ar vgaconf
Possible values for this option are
.Cm io
diff --git a/usr.sbin/bhyve/pci_fbuf.c b/usr.sbin/bhyve/pci_fbuf.c
--- a/usr.sbin/bhyve/pci_fbuf.c
+++ b/usr.sbin/bhyve/pci_fbuf.c
@@ -312,26 +312,23 @@
}
value = get_config_value_node(nvl, "w");
- if (value != NULL) {
- sc->memregs.width = atoi(value);
- if (sc->memregs.width > COLS_MAX) {
- EPRINTLN("fbuf: width %d too large", sc->memregs.width);
- return (-1);
- }
- if (sc->memregs.width == 0)
- sc->memregs.width = 1920;
- }
+ if (value != NULL)
+ sc->memregs.width = strtol(value, NULL, 10);
value = get_config_value_node(nvl, "h");
- if (value != NULL) {
- sc->memregs.height = atoi(value);
- if (sc->memregs.height > ROWS_MAX) {
- EPRINTLN("fbuf: height %d too large",
- sc->memregs.height);
- return (-1);
- }
- if (sc->memregs.height == 0)
- sc->memregs.height = 1080;
+ if (value != NULL)
+ sc->memregs.height = strtol(value, NULL, 10);
+
+ if (sc->memregs.width > COLS_MAX ||
+ sc->memregs.height > ROWS_MAX) {
+ EPRINTLN("fbuf: max resolution is %ux%u", COLS_MAX, ROWS_MAX);
+ return (-1);
+ }
+ if (sc->memregs.width < COLS_MIN ||
+ sc->memregs.height < ROWS_MIN) {
+ EPRINTLN("fbuf: minimum resolution is %ux%u",
+ COLS_MIN, ROWS_MIN);
+ return (-1);
}
value = get_config_value_node(nvl, "password");

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 9, 1:26 AM (3 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15728268
Default Alt Text
D42692.diff (1 KB)

Event Timeline