[libvirt] [PATCH v2 1/1] Add NVRAM device

Li Zhang zhlcindy at gmail.com
Tue Feb 26 01:29:46 UTC 2013


Daniel/Eric,

Any suggestion about this patch?

On 2013年02月25日 13:49, Li Zhang wrote:
> From: Li Zhang <zhlcindy at linux.vnet.ibm.com>
>
> For pSeries guest in QEMU, NVRAM is one kind of spapr-vio device.
> Users are allowed to specify spapr-vio devices'address.
> But NVRAM is not supported in libvirt. So this patch is to
> add NVRAM device to allow users to specify its address.
>
> In QEMU, NVRAM device's address is specified by
>   "-global spapr-nvram.reg=xxxxx".
>
> In libvirt, XML file is defined as the following:
>
>    <nvram>
>      <address type='spapr-vio' reg='0x3000'/>
>    </nvram>
>
> Signed-off-by: Li Zhang <zhlcindy at linux.vnet.ibm.com>
> ---
>   * v2 -> v1:
>      Add NVRAM parameters parsing in qemuParseCommandLine.
>
>   src/conf/domain_conf.c  |   83 ++++++++++++++++++++++++++++++++++++++++++++++-
>   src/conf/domain_conf.h  |   10 ++++++
>   src/qemu/qemu_command.c |   48 +++++++++++++++++++++++++++
>   src/qemu/qemu_command.h |    2 ++
>   4 files changed, 142 insertions(+), 1 deletion(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 10f361c..8c1e8ae 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -175,7 +175,8 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST,
>                 "redirdev",
>                 "smartcard",
>                 "chr",
> -              "memballoon")
> +              "memballoon",
> +              "nvram")
>   
>   VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST,
>                 "none",
> @@ -1442,6 +1443,16 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def)
>       VIR_FREE(def);
>   }
>   
> +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def)
> +{
> +    if (!def)
> +        return;
> +
> +    virDomainDeviceInfoClear(&def->info);
> +
> +    VIR_FREE(def);
> +}
> +
>   void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def)
>   {
>       if (!def)
> @@ -1602,6 +1613,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def)
>       case VIR_DOMAIN_DEVICE_SMARTCARD:
>       case VIR_DOMAIN_DEVICE_CHR:
>       case VIR_DOMAIN_DEVICE_MEMBALLOON:
> +    case VIR_DOMAIN_DEVICE_NVRAM:
>       case VIR_DOMAIN_DEVICE_LAST:
>           break;
>       }
> @@ -1791,6 +1803,7 @@ void virDomainDefFree(virDomainDefPtr def)
>       virDomainWatchdogDefFree(def->watchdog);
>   
>       virDomainMemballoonDefFree(def->memballoon);
> +    virDomainNVRAMDefFree(def->nvram);
>   
>       for (i = 0; i < def->nseclabels; i++)
>           virSecurityLabelDefFree(def->seclabels[i]);
> @@ -2342,6 +2355,12 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def,
>           if (cb(def, &device, &def->memballoon->info, opaque) < 0)
>               return -1;
>       }
> +    if (def->nvram) {
> +        device.type = VIR_DOMAIN_DEVICE_NVRAM;
> +        device.data.nvram = def->nvram;
> +        if (cb(def, &device, &def->nvram->info, opaque) < 0)
> +            return -1;
> +    }
>       device.type = VIR_DOMAIN_DEVICE_HUB;
>       for (i = 0; i < def->nhubs ; i++) {
>           device.data.hub = def->hubs[i];
> @@ -7461,6 +7480,23 @@ error:
>       goto cleanup;
>   }
>   
> +static virDomainNVRAMDefPtr
> +virDomainNVRAMDefParseXML(const xmlNodePtr node,
> +                               unsigned int flags)
> +{
> +   virDomainNVRAMDefPtr def;
> +
> +    if (VIR_ALLOC(def) < 0) {
> +        virReportOOMError();
> +        return NULL;
> +    }
> +
> +    if ( virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0 )
> +        return NULL;
> +
> +    return def;
> +}
> +
>   static virSysinfoDefPtr
>   virSysinfoParseXML(const xmlNodePtr node,
>                     xmlXPathContextPtr ctxt)
> @@ -10572,6 +10608,32 @@ virDomainDefParseXML(virCapsPtr caps,
>           }
>       }
>   
> +    def->nvram = NULL;
> +    if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) {
> +        goto error;
> +    }
> +
> +    if (n > 1) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("only a single nvram device is supported"));
> +        goto error;
> +    }
> +
> +    if (n > 0) {
> +        virDomainNVRAMDefPtr nvram =
> +            virDomainNVRAMDefParseXML(nodes[0], flags);
> +        if (!nvram)
> +            goto error;
> +        def->nvram = nvram;
> +        VIR_FREE(nodes);
> +    } else {
> +        virDomainNVRAMDefPtr nvram;
> +        if (VIR_ALLOC(nvram) < 0)
> +            goto no_memory;
> +        nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE;
> +        def->nvram = nvram;
> +    }
> +
>       /* analysis of the hub devices */
>       if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) {
>           goto error;
> @@ -13547,6 +13609,21 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
>   }
>   
>   static int
> +virDomainNVRAMDefFormat(virBufferPtr buf,
> +                             virDomainNVRAMDefPtr def,
> +                             unsigned int flags)
> +{
> +    virBufferAsprintf(buf, "    <nvram>\n");
> +    if (virDomainDeviceInfoIsSet(&def->info, flags))
> +        if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0)
> +            return -1;
> +
> +     virBufferAddLit(buf, "    </nvram>\n");
> +
> +     return 0;
> +}
> +
> +static int
>   virDomainSysinfoDefFormat(virBufferPtr buf,
>                             virSysinfoDefPtr def)
>   {
> @@ -14787,6 +14864,9 @@ virDomainDefFormatInternal(virDomainDefPtr def,
>       if (def->memballoon)
>           virDomainMemballoonDefFormat(buf, def->memballoon, flags);
>   
> +    if (def->nvram)
> +        virDomainNVRAMDefFormat(buf, def->nvram, flags);
> +
>       virBufferAddLit(buf, "  </devices>\n");
>   
>       virBufferAdjustIndent(buf, 2);
> @@ -16061,6 +16141,7 @@ virDomainDeviceDefCopy(virCapsPtr caps,
>       case VIR_DOMAIN_DEVICE_SMARTCARD:
>       case VIR_DOMAIN_DEVICE_CHR:
>       case VIR_DOMAIN_DEVICE_MEMBALLOON:
> +    case VIR_DOMAIN_DEVICE_NVRAM:
>       case VIR_DOMAIN_DEVICE_LAST:
>           virReportError(VIR_ERR_INTERNAL_ERROR,
>                          _("Copying definition of '%d' type "
> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index 4ffa4aa..8e5f1d8 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -108,6 +108,9 @@ typedef virDomainChrDef *virDomainChrDefPtr;
>   typedef struct _virDomainMemballoonDef virDomainMemballoonDef;
>   typedef virDomainMemballoonDef *virDomainMemballoonDefPtr;
>   
> +typedef struct _virDomainNVRAMDef virDomainNVRAMDef;
> +typedef virDomainNVRAMDef *virDomainNVRAMDefPtr;
> +
>   typedef struct _virDomainSnapshotObj virDomainSnapshotObj;
>   typedef virDomainSnapshotObj *virDomainSnapshotObjPtr;
>   
> @@ -133,6 +136,7 @@ typedef enum {
>       VIR_DOMAIN_DEVICE_SMARTCARD,
>       VIR_DOMAIN_DEVICE_CHR,
>       VIR_DOMAIN_DEVICE_MEMBALLOON,
> +    VIR_DOMAIN_DEVICE_NVRAM,
>   
>       VIR_DOMAIN_DEVICE_LAST
>   } virDomainDeviceType;
> @@ -158,6 +162,7 @@ struct _virDomainDeviceDef {
>           virDomainSmartcardDefPtr smartcard;
>           virDomainChrDefPtr chr;
>           virDomainMemballoonDefPtr memballoon;
> +        virDomainNVRAMDefPtr nvram;
>       } data;
>   };
>   
> @@ -1418,6 +1423,9 @@ struct _virDomainMemballoonDef {
>       virDomainDeviceInfo info;
>   };
>   
> +struct _virDomainNVRAMDef {
> +    virDomainDeviceInfo info;
> +};
>   
>   enum virDomainSmbiosMode {
>       VIR_DOMAIN_SMBIOS_NONE,
> @@ -1849,6 +1857,7 @@ struct _virDomainDef {
>       /* Only 1 */
>       virDomainWatchdogDefPtr watchdog;
>       virDomainMemballoonDefPtr memballoon;
> +    virDomainNVRAMDefPtr nvram;
>       virCPUDefPtr cpu;
>       virSysinfoDefPtr sysinfo;
>       virDomainRedirFilterDefPtr redirfilter;
> @@ -1951,6 +1960,7 @@ int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src,
>   void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def);
>   void virDomainSoundDefFree(virDomainSoundDefPtr def);
>   void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def);
> +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def);
>   void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def);
>   void virDomainVideoDefFree(virDomainVideoDefPtr def);
>   virDomainHostdevDefPtr virDomainHostdevDefAlloc(void);
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index dee493f..30694d6 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -941,6 +941,13 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
>               goto cleanup;
>       }
>   
> +    if (def->os.arch == VIR_ARCH_PPC64 &&
> +        STREQ(def->os.machine, "pseries"))
> +        def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
> +     if (qemuAssignSpaprVIOAddress(def, &def->nvram->info,
> +                                   0x3000ul) < 0)
> +        goto cleanup;
> +
>       /* No other devices are currently supported on spapr-vio */
>   
>       ret = 0;
> @@ -3406,6 +3413,17 @@ error:
>       return NULL;
>   }
>   
> +char *
> +qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev)
> +{
> +     virBuffer buf = VIR_BUFFER_INITIALIZER;
> +     if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO &&
> +         dev->info.addr.spaprvio.has_reg)
> +        virBufferAsprintf(&buf, "spapr-nvram.reg=0x%llx",
> +                          dev->info.addr.spaprvio.reg);
> +
> +     return virBufferContentAndReset(&buf);
> +}
>   
>   char *
>   qemuBuildUSBInputDevStr(virDomainInputDefPtr dev,
> @@ -7006,6 +7024,19 @@ qemuBuildCommandLine(virConnectPtr conn,
>           }
>       }
>   
> +    if (def->nvram &&
> +        def->os.arch == VIR_ARCH_PPC64 &&
> +        STREQ(def->os.machine, "pseries")) {
> +        char *optstr;
> +        virCommandAddArg(cmd, "-global");
> +        optstr = qemuBuildNVRAMDevStr(def->nvram);
> +        if (!optstr)
> +            goto error;
> +        if (optstr)
> +           virCommandAddArg(cmd, optstr);
> +        VIR_FREE(optstr);
> +    }
> +
>       if (snapshot)
>           virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL);
>   
> @@ -9139,6 +9170,23 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
>                   goto error;
>               }
>   
> +        } else if (STREQ(arg, "-global") &&
> +                   STRPREFIX(progargv[i + 1], "spapr-nvram.reg=")) {
> +
> +           WANT_VALUE();
> +
> +           if (VIR_ALLOC(def->nvram) < 0)
> +               goto no_memory;
> +
> +           val += strlen("spapr-nvram.reg=");
> +           if (virStrToLong_ull(val, NULL, 16,
> +                               &def->nvram->info.addr.spaprvio.reg) < 0) {
> +                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                              _("invalid value for spapr-nvram.reg :"
> +                                 "'%s'"), val);
> +                goto error;
> +          }
> +
>           } else if (STREQ(arg, "-S")) {
>               /* ignore, always added by libvirt */
>           } else {
> diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
> index e4db000..7a0fe17 100644
> --- a/src/qemu/qemu_command.h
> +++ b/src/qemu/qemu_command.h
> @@ -118,6 +118,8 @@ char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev,
>   char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev,
>                                    virQEMUCapsPtr qemuCaps);
>   
> +char * qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev);
> +
>   char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev,
>                                  virQEMUCapsPtr qemuCaps);
>   




More information about the libvir-list mailing list