Page MenuHomeFreeBSD
Files F97595152

D39316.diff
No OneTemporary
Actions

D39316.diff
View Options

diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c
--- a/usr.sbin/bhyve/qemu_fwcfg.c
+++ b/usr.sbin/bhyve/qemu_fwcfg.c
@@ -42,6 +42,7 @@
#define QEMU_FWCFG_INDEX_SIGNATURE 0x00
#define QEMU_FWCFG_INDEX_ID 0x01
+#define QEMU_FWCFG_INDEX_NB_CPUS 0x05
#define QEMU_FWCFG_INDEX_FILE_DIR 0x19
#define QEMU_FWCFG_FIRST_FILE_INDEX 0x20
@@ -225,6 +226,20 @@
(uint8_t *)fwcfg_id));
}
+static int
+qemu_fwcfg_add_item_nb_cpus(void)
+{
+ uint16_t *fwcfg_max_cpus = calloc(1, sizeof(uint16_t));
+ if (fwcfg_max_cpus == NULL) {
+ return (ENOMEM);
+ }
+
+ *fwcfg_max_cpus = htole16(guest_ncpus);
+
+ return (qemu_fwcfg_add_item(QEMU_FWCFG_ARCHITECTURE_GENERIC,
+ QEMU_FWCFG_INDEX_NB_CPUS, sizeof(uint16_t), fwcfg_max_cpus));
+}
+
static int
qemu_fwcfg_add_item_signature(void)
{
@@ -408,6 +423,10 @@
warnx("%s: Unable to add id item", __func__);
goto done;
}
+ if ((error = qemu_fwcfg_add_item_nb_cpus()) != 0) {
+ warnx("%s: Unable to add nb_cpus item", __func__);
+ goto done;
+ }
if ((error = qemu_fwcfg_add_item_file_dir()) != 0) {
warnx("%s: Unable to add file_dir item", __func__);
goto done;

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 1, 6:21 AM (21 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13234815
Default Alt Text
D39316.diff (1 KB)

Event Timeline