6:12 p.m.
* docs/schemas/domain.rng (sysinfo-system-name): Also allow
family.
* src/util/sysinfo.h (struct _virSysinfoDef): Add system_family.
* src/conf/domain_conf.c (virSysinfoParseXML)
(virDomainSysinfoDefFormat): Support it.
* src/util/sysinfo.c (virSysinfoDefFree, virSysinfoRead): Likewise.
* src/qemu/qemu_conf.c (qemuBuildSmbiosSystemStr): Likewise.
* tests/qemuxml2argvdata/qemuxml2argv-smbios.xml: Adjust test.
* tests/qemuxml2argvdata/qemuxml2argv-smbios.args: Likewise.
---
docs/schemas/domain.rng | 1 +
src/conf/domain_conf.c | 9 ++++++++-
src/qemu/qemu_conf.c | 6 +++++-
src/util/sysinfo.c | 7 +++++++
src/util/sysinfo.h | 1 +
tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 2 ++
7 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index fb44335..6c47ea0 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -1873,6 +1873,7 @@
<value>serial</value>
<value>uuid</value>
<value>sku</value>
+ <value>family</value>
</choice>
</define>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3f14cee..91d7cce 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3626,6 +3626,8 @@ virSysinfoParseXML(const xmlNodePtr node,
virXPathString("string(system/entry[@name='uuid'])", ctxt);
def->system_sku =
virXPathString("string(system/entry[@name='sku'])", ctxt);
+ def->system_family =
+ virXPathString("string(system/entry[@name='family'])", ctxt);
cleanup:
VIR_FREE(type);
@@ -6426,7 +6428,8 @@ virDomainSysinfoDefFormat(virBufferPtr buf,
}
if ((def->system_manufacturer != NULL) || (def->system_product != NULL) ||
(def->system_version != NULL) || (def->system_serial != NULL) ||
- (def->system_uuid != NULL) || (def->system_sku != NULL)) {
+ (def->system_uuid != NULL) || (def->system_sku != NULL) ||
+ (def->system_family != NULL)) {
virBufferAddLit(buf, " <system>\n");
if (def->system_manufacturer != NULL)
virBufferEscapeString(buf,
@@ -6452,6 +6455,10 @@ virDomainSysinfoDefFormat(virBufferPtr buf,
virBufferEscapeString(buf,
" <entry
name='sku'>%s</entry>\n",
def->system_sku);
+ if (def->system_family != NULL)
+ virBufferEscapeString(buf,
+ " <entry
name='family'>%s</entry>\n",
+ def->system_family);
virBufferAddLit(buf, " </system>\n");
}
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 50c1e6c..ad4d4fc 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -3642,7 +3642,8 @@ static char *qemuBuildSmbiosSystemStr(virSysinfoDefPtr def)
if ((def->system_manufacturer == NULL) && (def->system_sku == NULL)
&&
(def->system_product == NULL) && (def->system_uuid == NULL)
&&
- (def->system_version == NULL) && (def->system_serial == NULL))
+ (def->system_version == NULL) && (def->system_serial == NULL)
&&
+ (def->system_family == NULL))
return(NULL);
virBufferAddLit(&buf, "type=1");
@@ -3666,6 +3667,9 @@ static char *qemuBuildSmbiosSystemStr(virSysinfoDefPtr def)
/* 1:SKU Number */
if (def->system_sku)
virBufferVSprintf(&buf, ",sku=%s", def->system_sku);
+ /* 1:Family */
+ if (def->system_family)
+ virBufferVSprintf(&buf, ",family=%s", def->system_family);
if (virBufferError(&buf)) {
virReportOOMError();
diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
index 8ad98fe..cf41773 100644
--- a/src/util/sysinfo.c
+++ b/src/util/sysinfo.c
@@ -68,6 +68,7 @@ void virSysinfoDefFree(virSysinfoDefPtr def)
VIR_FREE(def->system_serial);
VIR_FREE(def->system_uuid);
VIR_FREE(def->system_sku);
+ VIR_FREE(def->system_family);
VIR_FREE(def);
}
@@ -217,6 +218,12 @@ virSysinfoRead(void) {
if ((eol) && ((ret->system_sku = strndup(cur, eol - cur)) == NULL))
goto no_memory;
}
+ if ((cur = strstr(base, "Family: ")) != NULL) {
+ cur += 8;
+ eol = strchr(cur, '\n');
+ if ((eol) && ((ret->system_family = strndup(cur, eol - cur)) ==
NULL))
+ goto no_memory;
+ }
cleanup:
VIR_FREE(outbuf);
diff --git a/src/util/sysinfo.h b/src/util/sysinfo.h
index 611d54e..1af7ef6 100644
--- a/src/util/sysinfo.h
+++ b/src/util/sysinfo.h
@@ -49,6 +49,7 @@ struct _virSysinfoDef {
char *system_serial;
char *system_uuid;
char *system_sku;
+ char *system_family;
};
virSysinfoDefPtr virSysinfoRead(void);
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
index bd3ede4..b5e4783 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
@@ -1 +1 @@
-LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214
-smp 1 -smbios type=0,vendor=QEmu/KVM,version=0.13 -smbios
type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,serial=32dfcb37-5af1-552b-357c-be8c3aa38310,uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809
-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda
/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214
-smp 1 -smbios type=0,vendor=QEmu/KVM,version=0.13 -smbios
type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,serial=32dfcb37-5af1-552b-357c-be8c3aa38310,uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red
Hat -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda
/dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
index 66cbbb0..45b6dba 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml
@@ -15,6 +15,8 @@
<entry name="version">0.8.2-3.fc14</entry>
<entry
name="serial">32dfcb37-5af1-552b-357c-be8c3aa38310</entry>
<entry
name="uuid">c7a5fdbd-edaf-9455-926a-d65c16db1809</entry>
+ <entry name="sku">1234567890</entry>
+ <entry name="family">Red Hat</entry>
</system>
</sysinfo>
<os>
--
1.7.1