d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bhyve: add QEMU_FWCFG_INDEX_MAX_CPUS item

Browse Source 
Requested-by:		coreboot
Reviewed by:		<If someone else reviewed your modification.>
MFC after:		1 week
Sponsored by:		Beckhoff Automation GmbH & Co. KG
Differential Revision:	https://reviews.freebsd.org/D39315
This commit is contained in:
Corvin Köhne 2022-06-21 10:35:40 +02:00
parent b6e67875a3
commit 305edaa479
No known key found for this signature in database
GPG Key ID: D854DA56315E026A
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.sbin/bhyve/qemu_fwcfg.c
View File

@ -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 @@ qemu_fwcfg_add_item_id(void)
(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 @@ qemu_fwcfg_init(struct vmctx *const ctx)
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;