Skip to contentSkip to conversation

hw/ipmi: Allow multiple BMC instances

PATCH In review Corey Minyard 2 participants 5 messages Apr 4, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/ipmi: Allow multiple BMC instances

Allow a system to have multiple BMC connections to the same BMC and multiple different BMCs. This can happen on real systems, and is useful for testing the IPMI driver on Linux.

---
I'm working on a fairly extensive test suite for IPMI, the Linux driver and qemu, and this is necessary for some driver tests.

 hw/ipmi/ipmi.c            | 1 +
 hw/ipmi/ipmi_bmc_extern.c | 5 +++--
 hw/ipmi/ipmi_bmc_sim.c    | 2 +-
 include/hw/ipmi/ipmi.h    | 1 +
 qemu-options.hx           | 9 ++++++++-
 5 files changed, 14 insertions(+), 4 deletions(-)
hw/ipmi/ipmi.c +1 -0
index fdeaa5269f..ffd972f78b 100644
@@ -110,6 +110,7 @@ void ipmi_bmc_find_and_link(Object *obj, Object **bmc)
 
 static const Property ipmi_bmc_properties[] = {
     DEFINE_PROP_UINT8("slave_addr",  IPMIBmc, slave_addr, 0x20),
+    DEFINE_PROP_UINT8("instance",    IPMIBmc, instance, 0),
 };
 
 static void bmc_class_init(ObjectClass *oc, void *data)
hw/ipmi/ipmi_bmc_extern.c +3 -2
index d015500254..11c28d03ab 100644
@@ -488,7 +488,8 @@ static const VMStateDescription vmstate_ipmi_bmc_extern = {
 
 static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
 {
-    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(dev);
+    IPMIBmc *b = IPMI_BMC(dev);
+    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(b);
 
     if (!qemu_chr_fe_backend_connected(&ibe->chr)) {
         error_setg(errp, "IPMI external bmc requires chardev attribute");
@@ -498,7 +499,7 @@ static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
     qemu_chr_fe_set_handlers(&ibe->chr, can_receive, receive,
                              chr_event, NULL, ibe, NULL, true);
 
-    vmstate_register(NULL, 0, &vmstate_ipmi_bmc_extern, ibe);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_bmc_extern, ibe);
 }
 
 static void ipmi_bmc_extern_init(Object *obj)
hw/ipmi/ipmi_bmc_sim.c +1 -1
index 6157ac7120..c1b39dbdc5 100644
@@ -2188,7 +2188,7 @@ static void ipmi_sim_realize(DeviceState *dev, Error **errp)
 
     ibs->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ipmi_timeout, ibs);
 
-    vmstate_register(NULL, 0, &vmstate_ipmi_sim, ibs);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_sim, ibs);
 }
 
 static const Property ipmi_sim_properties[] = {
include/hw/ipmi/ipmi.h +1 -0
index 77a7213ed9..4436d70842 100644
@@ -183,6 +183,7 @@ struct IPMIBmc {
     DeviceState parent;
 
     uint8_t slave_addr;
+    uint8_t instance;
 
     IPMIInterface *intf;
 };
qemu-options.hx +8 -1
index dc694a99a3..186433ac13 100644
@@ -1120,6 +1120,10 @@ SRST
     ``slave_addr=val``
         Define slave address to use for the BMC. The default is 0x20.
 
+    ``instance=val``
+        For more than one BMC on the same system, each instance needs
+	a unique number.  The default is 0.
+
     ``sdrfile=file``
         file containing raw Sensor Data Records (SDR) data. The default
         is none.
@@ -1137,7 +1141,7 @@ SRST
         is set, get "Get GUID" command to the BMC will return it.
         Otherwise "Get GUID" will return an error.
 
-``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val]``
+``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val][,instance=id]``
     Add a connection to an external IPMI BMC simulator. Instead of
     locally emulating the BMC like the above item, instead connect to an
     external entity that provides the IPMI services.
@@ -1151,6 +1155,9 @@ SRST
     simulator running on a secure port on localhost, so neither the
     simulator nor QEMU is exposed to any outside network.
 
+    You can have more than one external BMC connection with this, but
+    you must set a unique instance for each BMC.
+
     See the "lanserv/README.vm" file in the OpenIPMI library for more
     details on the external interface.
 
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw

Hi Corey,

Quoted 21 lines · Corey Minyard

Allow a system to have multiple BMC connections to the same BMC and multiple different BMCs. This can happen on real systems, and is useful for testing the IPMI driver on Linux.

---
I'm working on a fairly extensive test suite for IPMI, the Linux driver and qemu, and this is necessary for some driver tests.

  hw/ipmi/ipmi.c            | 1 +
  hw/ipmi/ipmi_bmc_extern.c | 5 +++--
  hw/ipmi/ipmi_bmc_sim.c    | 2 +-
  include/hw/ipmi/ipmi.h    | 1 +
  qemu-options.hx           | 9 ++++++++-
  5 files changed, 14 insertions(+), 4 deletions(-)
hw/ipmi/ipmi.c +0 -0
index fdeaa5269f..ffd972f78b 100644

hw/ipmi/ipmi.c void ipmi_bmc_find_and_link(Object *obj, Object **bmc) · line 113

Quoted 4 lines
hw/ipmi/ipmi.c +1 -0
@@ -110,6 +110,7 @@ void ipmi_bmc_find_and_link(Object *obj, Object **bmc)
 
  static const Property ipmi_bmc_properties[] = {
      DEFINE_PROP_UINT8("slave_addr",  IPMIBmc, slave_addr, 0x20),
+    DEFINE_PROP_UINT8("instance",    IPMIBmc, instance, 0),

Can we use "id" instead of "instance"? The latter confuses me, but maybe a matter of taste.

Preferably s/instance/id/:

Quoted 85 lines
hw/ipmi/ipmi.c +0 -0
  };
 
  static void bmc_class_init(ObjectClass *oc, void *data)
hw/ipmi/ipmi_bmc_extern.c +3 -2
index d015500254..11c28d03ab 100644
@@ -488,7 +488,8 @@ static const VMStateDescription vmstate_ipmi_bmc_extern = {
 
  static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
  {
-    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(dev);
+    IPMIBmc *b = IPMI_BMC(dev);
+    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(b);
 
      if (!qemu_chr_fe_backend_connected(&ibe->chr)) {
          error_setg(errp, "IPMI external bmc requires chardev attribute");
@@ -498,7 +499,7 @@ static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
      qemu_chr_fe_set_handlers(&ibe->chr, can_receive, receive,
                               chr_event, NULL, ibe, NULL, true);
 
-    vmstate_register(NULL, 0, &vmstate_ipmi_bmc_extern, ibe);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_bmc_extern, ibe);
  }
 
  static void ipmi_bmc_extern_init(Object *obj)
hw/ipmi/ipmi_bmc_sim.c +1 -1
index 6157ac7120..c1b39dbdc5 100644
@@ -2188,7 +2188,7 @@ static void ipmi_sim_realize(DeviceState *dev, Error **errp)
 
      ibs->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ipmi_timeout, ibs);
 
-    vmstate_register(NULL, 0, &vmstate_ipmi_sim, ibs);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_sim, ibs);
  }
 
  static const Property ipmi_sim_properties[] = {
include/hw/ipmi/ipmi.h +1 -0
index 77a7213ed9..4436d70842 100644
@@ -183,6 +183,7 @@ struct IPMIBmc {
      DeviceState parent;
 
      uint8_t slave_addr;
+    uint8_t instance;
 
      IPMIInterface *intf;
  };
qemu-options.hx +8 -1
index dc694a99a3..186433ac13 100644
@@ -1120,6 +1120,10 @@ SRST
      ``slave_addr=val``
          Define slave address to use for the BMC. The default is 0x20.
 
+    ``instance=val``
+        For more than one BMC on the same system, each instance needs
+	a unique number.  The default is 0.
+
      ``sdrfile=file``
          file containing raw Sensor Data Records (SDR) data. The default
          is none.
@@ -1137,7 +1141,7 @@ SRST
          is set, get "Get GUID" command to the BMC will return it.
          Otherwise "Get GUID" will return an error.
 
-``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val]``
+``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val][,instance=id]``
      Add a connection to an external IPMI BMC simulator. Instead of
      locally emulating the BMC like the above item, instead connect to an
      external entity that provides the IPMI services.
@@ -1151,6 +1155,9 @@ SRST
      simulator running on a secure port on localhost, so neither the
      simulator nor QEMU is exposed to any outside network.
 
+    You can have more than one external BMC connection with this, but
+    you must set a unique instance for each BMC.
+
      See the "lanserv/README.vm" file in the OpenIPMI library for more
      details on the external interface.
 
#2 lore raw
Quoted 19 lines · Philippe Mathieu-Daudé

Hi Corey,

Quoted 16 lines · Corey Minyard

Allow a system to have multiple BMC connections to the same BMC and multiple different BMCs. This can happen on real systems, and is useful for testing the IPMI driver on Linux.

---
I'm working on a fairly extensive test suite for IPMI, the Linux driver and qemu, and this is necessary for some driver tests.

  hw/ipmi/ipmi.c            | 1 +
  hw/ipmi/ipmi_bmc_extern.c | 5 +++--
  hw/ipmi/ipmi_bmc_sim.c    | 2 +-
  include/hw/ipmi/ipmi.h    | 1 +
  qemu-options.hx           | 9 ++++++++-
  5 files changed, 14 insertions(+), 4 deletions(-)
Quoted 11 lines

hw/ipmi/ipmi.c void ipmi_bmc_find_and_link(Object *obj, Object **bmc) · line 112

Quoted 8 lines
hw/ipmi/ipmi.c +1 -0
index fdeaa5269f..ffd972f78b 100644
@@ -110,6 +110,7 @@ void ipmi_bmc_find_and_link(Object *obj, Object **bmc)
  static const Property ipmi_bmc_properties[] = {
      DEFINE_PROP_UINT8("slave_addr",  IPMIBmc, slave_addr, 0x20),
+    DEFINE_PROP_UINT8("instance",    IPMIBmc, instance, 0),

Can we use "id" instead of "instance"? The latter confuses me, but maybe a matter of taste.

"id" means "identifier", not "instance". The error log mentions "instance", that that is what is passed to vmstate_register().

Maybe it's better to just have a global variable that increments and not pass it in? That way it would work automatically.

-corey

Quoted 76 lines

Preferably s/instance/id/:

Quoted 71 lines
hw/ipmi/ipmi.c +0 -0
  };
  static void bmc_class_init(ObjectClass *oc, void *data)
hw/ipmi/ipmi_bmc_extern.c +3 -2
index d015500254..11c28d03ab 100644
@@ -488,7 +488,8 @@ static const VMStateDescription vmstate_ipmi_bmc_extern = {
  static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
  {
-    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(dev);
+    IPMIBmc *b = IPMI_BMC(dev);
+    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(b);
      if (!qemu_chr_fe_backend_connected(&ibe->chr)) {
          error_setg(errp, "IPMI external bmc requires chardev attribute");
@@ -498,7 +499,7 @@ static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
      qemu_chr_fe_set_handlers(&ibe->chr, can_receive, receive,
                               chr_event, NULL, ibe, NULL, true);
-    vmstate_register(NULL, 0, &vmstate_ipmi_bmc_extern, ibe);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_bmc_extern, ibe);
  }
  static void ipmi_bmc_extern_init(Object *obj)
hw/ipmi/ipmi_bmc_sim.c +1 -1
index 6157ac7120..c1b39dbdc5 100644
@@ -2188,7 +2188,7 @@ static void ipmi_sim_realize(DeviceState *dev, Error **errp)
      ibs->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ipmi_timeout, ibs);
-    vmstate_register(NULL, 0, &vmstate_ipmi_sim, ibs);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_sim, ibs);
  }
  static const Property ipmi_sim_properties[] = {
include/hw/ipmi/ipmi.h +1 -0
index 77a7213ed9..4436d70842 100644
@@ -183,6 +183,7 @@ struct IPMIBmc {
      DeviceState parent;
      uint8_t slave_addr;
+    uint8_t instance;
      IPMIInterface *intf;
  };
qemu-options.hx +8 -1
index dc694a99a3..186433ac13 100644
@@ -1120,6 +1120,10 @@ SRST
      ``slave_addr=val``
          Define slave address to use for the BMC. The default is 0x20.
+    ``instance=val``
+        For more than one BMC on the same system, each instance needs
+	a unique number.  The default is 0.
+
      ``sdrfile=file``
          file containing raw Sensor Data Records (SDR) data. The default
          is none.
@@ -1137,7 +1141,7 @@ SRST
          is set, get "Get GUID" command to the BMC will return it.
          Otherwise "Get GUID" will return an error.
-``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val]``
+``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val][,instance=id]``
      Add a connection to an external IPMI BMC simulator. Instead of
      locally emulating the BMC like the above item, instead connect to an
      external entity that provides the IPMI services.
@@ -1151,6 +1155,9 @@ SRST
      simulator running on a secure port on localhost, so neither the
      simulator nor QEMU is exposed to any outside network.
+    You can have more than one external BMC connection with this, but
+    you must set a unique instance for each BMC.
+
      See the "lanserv/README.vm" file in the OpenIPMI library for more
      details on the external interface.
#3 lore raw
Quoted 32 lines · Corey Minyard
Quoted 19 lines · Philippe Mathieu-Daudé

Hi Corey,

Quoted 16 lines · Corey Minyard

Allow a system to have multiple BMC connections to the same BMC and multiple different BMCs. This can happen on real systems, and is useful for testing the IPMI driver on Linux.

---
I'm working on a fairly extensive test suite for IPMI, the Linux driver and qemu, and this is necessary for some driver tests.

   hw/ipmi/ipmi.c            | 1 +
   hw/ipmi/ipmi_bmc_extern.c | 5 +++--
   hw/ipmi/ipmi_bmc_sim.c    | 2 +-
   include/hw/ipmi/ipmi.h    | 1 +
   qemu-options.hx           | 9 ++++++++-
   5 files changed, 14 insertions(+), 4 deletions(-)
Quoted 11 lines

hw/ipmi/ipmi.c void ipmi_bmc_find_and_link(Object *obj, Object **bmc) · line 112

Quoted 8 lines
hw/ipmi/ipmi.c +1 -0
index fdeaa5269f..ffd972f78b 100644
@@ -110,6 +110,7 @@ void ipmi_bmc_find_and_link(Object *obj, Object **bmc)
   static const Property ipmi_bmc_properties[] = {
       DEFINE_PROP_UINT8("slave_addr",  IPMIBmc, slave_addr, 0x20),
+    DEFINE_PROP_UINT8("instance",    IPMIBmc, instance, 0),

Can we use "id" instead of "instance"? The latter confuses me, but maybe a matter of taste.

Quoted 2 lines

"id" means "identifier", not "instance". The error log mentions "instance", that that is what is passed to vmstate_register().

Note, vmstate_register() is a legacy API, with only 20 cases left to update. See commit 6caf1571a97 ("include/migration: mark vmstate_register() as a legacy function"):

/**
* vmstate_register() - legacy function to register state
* serialisation description
*
* New code shouldn't be using this function as QOM-ified devices
* have dc->vmsd to store the serialisation description. *
* Returns: 0 on success, -1 on failure
*/

Quoted 2 lines

Maybe it's better to just have a global variable that increments and not pass it in? That way it would work automatically.

Global variables often hide suble problems. We have a list of some used in qdev / qbus / pci that we plan to remove, because it makes command line not reproducible.

See this thread:
https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 79 lines

-corey

Quoted 76 lines

Preferably s/instance/id/:

Quoted 71 lines
hw/ipmi/ipmi.c +0 -0
   };
   static void bmc_class_init(ObjectClass *oc, void *data)
hw/ipmi/ipmi_bmc_extern.c +3 -2
index d015500254..11c28d03ab 100644
@@ -488,7 +488,8 @@ static const VMStateDescription vmstate_ipmi_bmc_extern = {
   static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
   {
-    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(dev);
+    IPMIBmc *b = IPMI_BMC(dev);
+    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(b);
       if (!qemu_chr_fe_backend_connected(&ibe->chr)) {
           error_setg(errp, "IPMI external bmc requires chardev attribute");
@@ -498,7 +499,7 @@ static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
       qemu_chr_fe_set_handlers(&ibe->chr, can_receive, receive,
                                chr_event, NULL, ibe, NULL, true);
-    vmstate_register(NULL, 0, &vmstate_ipmi_bmc_extern, ibe);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_bmc_extern, ibe);
   }
   static void ipmi_bmc_extern_init(Object *obj)
hw/ipmi/ipmi_bmc_sim.c +1 -1
index 6157ac7120..c1b39dbdc5 100644
@@ -2188,7 +2188,7 @@ static void ipmi_sim_realize(DeviceState *dev, Error **errp)
       ibs->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ipmi_timeout, ibs);
-    vmstate_register(NULL, 0, &vmstate_ipmi_sim, ibs);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_sim, ibs);
   }
   static const Property ipmi_sim_properties[] = {
include/hw/ipmi/ipmi.h +1 -0
index 77a7213ed9..4436d70842 100644
@@ -183,6 +183,7 @@ struct IPMIBmc {
       DeviceState parent;
       uint8_t slave_addr;
+    uint8_t instance;
       IPMIInterface *intf;
   };
qemu-options.hx +8 -1
index dc694a99a3..186433ac13 100644
@@ -1120,6 +1120,10 @@ SRST
       ``slave_addr=val``
           Define slave address to use for the BMC. The default is 0x20.
+    ``instance=val``
+        For more than one BMC on the same system, each instance needs
+	a unique number.  The default is 0.
+
       ``sdrfile=file``
           file containing raw Sensor Data Records (SDR) data. The default
           is none.
@@ -1137,7 +1141,7 @@ SRST
           is set, get "Get GUID" command to the BMC will return it.
           Otherwise "Get GUID" will return an error.
-``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val]``
+``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val][,instance=id]``
       Add a connection to an external IPMI BMC simulator. Instead of
       locally emulating the BMC like the above item, instead connect to an
       external entity that provides the IPMI services.
@@ -1151,6 +1155,9 @@ SRST
       simulator running on a secure port on localhost, so neither the
       simulator nor QEMU is exposed to any outside network.
+    You can have more than one external BMC connection with this, but
+    you must set a unique instance for each BMC.
+
       See the "lanserv/README.vm" file in the OpenIPMI library for more
       details on the external interface.
#4 lore raw
Quoted 50 lines · Philippe Mathieu-Daudé
Quoted 32 lines · Corey Minyard
Quoted 19 lines · Philippe Mathieu-Daudé

Hi Corey,

Quoted 16 lines · Corey Minyard

Allow a system to have multiple BMC connections to the same BMC and multiple different BMCs. This can happen on real systems, and is useful for testing the IPMI driver on Linux.

---
I'm working on a fairly extensive test suite for IPMI, the Linux driver and qemu, and this is necessary for some driver tests.

   hw/ipmi/ipmi.c            | 1 +
   hw/ipmi/ipmi_bmc_extern.c | 5 +++--
   hw/ipmi/ipmi_bmc_sim.c    | 2 +-
   include/hw/ipmi/ipmi.h    | 1 +
   qemu-options.hx           | 9 ++++++++-
   5 files changed, 14 insertions(+), 4 deletions(-)
Quoted 11 lines

hw/ipmi/ipmi.c void ipmi_bmc_find_and_link(Object *obj, Object **bmc) · line 112

Quoted 8 lines
hw/ipmi/ipmi.c +1 -0
index fdeaa5269f..ffd972f78b 100644
@@ -110,6 +110,7 @@ void ipmi_bmc_find_and_link(Object *obj, Object **bmc)
   static const Property ipmi_bmc_properties[] = {
       DEFINE_PROP_UINT8("slave_addr",  IPMIBmc, slave_addr, 0x20),
+    DEFINE_PROP_UINT8("instance",    IPMIBmc, instance, 0),

Can we use "id" instead of "instance"? The latter confuses me, but maybe a matter of taste.

Quoted 2 lines

"id" means "identifier", not "instance". The error log mentions "instance", that that is what is passed to vmstate_register().

Note, vmstate_register() is a legacy API, with only 20 cases left to update. See commit 6caf1571a97 ("include/migration: mark vmstate_register() as a legacy function"):

/**
* vmstate_register() - legacy function to register state
* serialisation description
*
* New code shouldn't be using this function as QOM-ified devices
* have dc->vmsd to store the serialisation description. *
* Returns: 0 on success, -1 on failure
*/

Quoted 6 lines
Quoted 2 lines

Maybe it's better to just have a global variable that increments and not pass it in? That way it would work automatically.

Global variables often hide suble problems. We have a list of some used in qdev / qbus / pci that we plan to remove, because it makes command line not reproducible.

Yeah, I was guessing that, and I also just found that the vmstate_register() was deprecated. I'll work on switching to the new API.

Thanks,

-corey

Quoted 84 lines

See this thread:
https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 79 lines

-corey

Quoted 76 lines

Preferably s/instance/id/:

Quoted 71 lines
hw/ipmi/ipmi.c +0 -0
   };
   static void bmc_class_init(ObjectClass *oc, void *data)
hw/ipmi/ipmi_bmc_extern.c +3 -2
index d015500254..11c28d03ab 100644
@@ -488,7 +488,8 @@ static const VMStateDescription vmstate_ipmi_bmc_extern = {
   static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
   {
-    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(dev);
+    IPMIBmc *b = IPMI_BMC(dev);
+    IPMIBmcExtern *ibe = IPMI_BMC_EXTERN(b);
       if (!qemu_chr_fe_backend_connected(&ibe->chr)) {
           error_setg(errp, "IPMI external bmc requires chardev attribute");
@@ -498,7 +499,7 @@ static void ipmi_bmc_extern_realize(DeviceState *dev, Error **errp)
       qemu_chr_fe_set_handlers(&ibe->chr, can_receive, receive,
                                chr_event, NULL, ibe, NULL, true);
-    vmstate_register(NULL, 0, &vmstate_ipmi_bmc_extern, ibe);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_bmc_extern, ibe);
   }
   static void ipmi_bmc_extern_init(Object *obj)
hw/ipmi/ipmi_bmc_sim.c +1 -1
index 6157ac7120..c1b39dbdc5 100644
@@ -2188,7 +2188,7 @@ static void ipmi_sim_realize(DeviceState *dev, Error **errp)
       ibs->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ipmi_timeout, ibs);
-    vmstate_register(NULL, 0, &vmstate_ipmi_sim, ibs);
+    vmstate_register(NULL, b->instance, &vmstate_ipmi_sim, ibs);
   }
   static const Property ipmi_sim_properties[] = {
include/hw/ipmi/ipmi.h +1 -0
index 77a7213ed9..4436d70842 100644
@@ -183,6 +183,7 @@ struct IPMIBmc {
       DeviceState parent;
       uint8_t slave_addr;
+    uint8_t instance;
       IPMIInterface *intf;
   };
qemu-options.hx +8 -1
index dc694a99a3..186433ac13 100644
@@ -1120,6 +1120,10 @@ SRST
       ``slave_addr=val``
           Define slave address to use for the BMC. The default is 0x20.
+    ``instance=val``
+        For more than one BMC on the same system, each instance needs
+	a unique number.  The default is 0.
+
       ``sdrfile=file``
           file containing raw Sensor Data Records (SDR) data. The default
           is none.
@@ -1137,7 +1141,7 @@ SRST
           is set, get "Get GUID" command to the BMC will return it.
           Otherwise "Get GUID" will return an error.
-``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val]``
+``-device ipmi-bmc-extern,id=id,chardev=id[,slave_addr=val][,instance=id]``
       Add a connection to an external IPMI BMC simulator. Instead of
       locally emulating the BMC like the above item, instead connect to an
       external entity that provides the IPMI services.
@@ -1151,6 +1155,9 @@ SRST
       simulator running on a secure port on localhost, so neither the
       simulator nor QEMU is exposed to any outside network.
+    You can have more than one external BMC connection with this, but
+    you must set a unique instance for each BMC.
+
       See the "lanserv/README.vm" file in the OpenIPMI library for more
       details on the external interface.