Re: git: 305edaa47918 - main - bhyve: add QEMU_FWCFG_INDEX_MAX_CPUS item
- In reply to: Corvin Köhne : "git: 305edaa47918 - main - bhyve: add QEMU_FWCFG_INDEX_MAX_CPUS item"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 12 Apr 2023 07:37:30 UTC
On Wed, 2023-04-12 at 07:35 +0000, Corvin Köhne wrote: > The branch main has been updated by corvink: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=305edaa47918a559de46a5d72060644009f1875c > > commit 305edaa47918a559de46a5d72060644009f1875c > Author:    Corvin Köhne <corvink@FreeBSD.org> > AuthorDate: 2022-06-21 08:35:40 +0000 > Commit:    Corvin Köhne <corvink@FreeBSD.org> > CommitDate: 2023-04-12 07:35:33 +0000 > >    bhyve: add QEMU_FWCFG_INDEX_MAX_CPUS item >    >    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 > --- >  usr.sbin/bhyve/qemu_fwcfg.c | 23 +++++++++++++++++++++++ >  1 file changed, 23 insertions(+) > > diff --git a/usr.sbin/bhyve/qemu_fwcfg.c > b/usr.sbin/bhyve/qemu_fwcfg.c > index 3c7cd0f33224..ddd73d06d34d 100644 > --- 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 @@ 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; Reviewed by: markj -- Kind regards, Corvin