D39315.id120134.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39315.id120134.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
	@@ -44,6 +44,7 @@
	#define QEMU_FWCFG_INDEX_SIGNATURE 0x00
	#define QEMU_FWCFG_INDEX_ID 0x01
	#define QEMU_FWCFG_INDEX_NB_CPUS 0x05
	+#define QEMU_FWCFG_INDEX_MAX_CPUS 0x0F
	#define QEMU_FWCFG_INDEX_FILE_DIR 0x19

	#define QEMU_FWCFG_FIRST_FILE_INDEX 0x20
	@@ -227,6 +228,24 @@
	(uint8_t *)fwcfg_id));
	}

	+static int
	+qemu_fwcfg_add_item_max_cpus(void)
	+{
	+ uint16_t *fwcfg_max_cpus = calloc(1, sizeof(uint16_t));
	+ if (fwcfg_max_cpus == NULL) {
	+ return (ENOMEM);
	+ }
	+
	+ /*
	+ * We don't support cpu hotplug yet. For that reason, use guest_ncpus instead
	+ * of maxcpus.
	+ */
	+ *fwcfg_max_cpus = htole16(guest_ncpus);
	+
	+ return (qemu_fwcfg_add_item(QEMU_FWCFG_ARCHITECTURE_GENERIC,
	+ QEMU_FWCFG_INDEX_MAX_CPUS, sizeof(uint16_t), fwcfg_max_cpus));
	+}
	+
	static int
	qemu_fwcfg_add_item_nb_cpus(void)
	{
	@@ -433,6 +452,10 @@
	warnx("%s: Unable to add nb_cpus item", __func__);
	goto done;
	}
	+ if ((error = qemu_fwcfg_add_item_max_cpus()) != 0) {
	+ warnx("%s: Unable to add max_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;