user-mode: Prune build dependencies (part 3)
PATCH v2 6/9 hw/core/qdev-properties: Export some integer-related functions
In reply to Philippe Mathieu-DaudéWe are going to split this file and reuse these static functions. Declare them in the local "qdev-prop-internal.h" header.
--- hw/core/qdev-prop-internal.h | 9 ++++++++ hw/core/qdev-properties.c | 42 +++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 20 deletions(-)
hw/core/qdev-prop-internal.h +9 -0
@@ -15,5 +15,14 @@ void qdev_propinfo_set_enum(Object *obj, Visitor *v, const char *name,void qdev_propinfo_set_default_value_enum (ObjectProperty *op,const Property *prop); +void qdev_propinfo_set_default_value_int (ObjectProperty *op, +const Property *prop); +void qdev_propinfo_set_default_value_uint (ObjectProperty *op, +const Property *prop); + +void qdev_propinfo_get_uint16 (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp); +void qdev_propinfo_get_int32 (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp);#endif
hw/core/qdev-properties.c +22 -20
124 lines not on this page · raw message
Signature · 1 line
2.21.1
PATCH v2 7/9 hw/core/qdev-properties: Extract system-mode specific properties
In reply to Philippe Mathieu-DaudéMove properties specific to machines into a separate file.
--- hw/core/qdev-properties-system.c | 602 ++++++++++++++++++++++++++++++- hw/core/qdev-properties.c | 590 ------------------------------ 2 files changed, 594 insertions(+), 598 deletions(-)
hw/core/qdev-properties-system.c +594 -8
@@ -11,19 +11,24 @@*/ #include "qemu/osdep.h" -#include "audio/audio.h" -#include "net/net.h" #include "hw/qdev-properties.h" #include "qapi/error.h" +#include "qapi/visitor.h" +#include "qapi/qapi-types-block.h" +#include "qapi/qapi-types-machine.h" +#include "qapi/qapi-types-migration.h" #include "qapi/qmp/qerror.h" +#include "qemu/ctype.h" +#include "qemu/cutils.h" +#include "qemu/error-report.h" +#include "qdev-prop-internal.h" + +#include "audio/audio.h" +#include "chardev/char-fe.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" -#include "hw/block/block.h" -#include "net/hub.h" -#include "qapi/visitor.h" -#include "chardev/char-fe.h" -#include "sysemu/iothread.h" -#include "sysemu/tpm_backend.h" +#include "net/net.h" +#include "hw/pci/pci.h" static void get_pointer(Object *obj, Visitor *v, Property *prop, char *(*print)(void *ptr),
@@ -273,6 +278,99 @@ const PropertyInfo qdev_prop_chr = { .release = release_chr, }; +/* --- mac address --- */ + +/* +* accepted syntax versions: +* 01:02:03:04:05:06 +* 01-02-03-04-05-06 +*/ +static void get_mac (Object *obj,Visitor *v,const char *name,void *opaque, +Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +MACAddr *mac =qdev_get_prop_ptr (dev, prop); +char buffer[2 *6 +5 +1 ]; +char *p = buffer; + +snprintf (buffer,sizeof (buffer),"%02x:%02x:%02x:%02x:%02x:%02x" , + mac->a[0 ], mac->a[1 ], mac->a[2 ], + mac->a[3 ], mac->a[4 ], mac->a[5 ]); + +visit_type_str (v, name, &p, errp); +} + +static void set_mac (Object *obj,Visitor *v,const char *name,void *opaque, +Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +MACAddr *mac =qdev_get_prop_ptr (dev, prop); +Error *local_err =NULL ; +int i, pos; +char *str; +const char *p; + +if (dev->realized) { +qdev_prop_set_after_realize (dev, name, errp); +return ; + } + +visit_type_str (v, name, &str, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + +for (i =0 , pos =0 ; i <6 ; i++, pos +=3 ) { +long val; + +if (!qemu_isxdigit (str[pos])) { + goto inval; + } +if (!qemu_isxdigit (str[pos +1 ])) { + goto inval; + } +if (i ==5 ) { +if (str[pos +2 ] !='\0' ) { + goto inval; + } + }else { +if (str[pos +2 ] !=':' && str[pos +2 ] !='-' ) { + goto inval; + } + } +if (qemu_strtol (str + pos, &p,16 , &val) <0 || val >0xff ) { + goto inval; + } + mac->a[i] = val; + } +g_free (str); +return ; + +inval: +error_set_from_qdev_prop_error (errp,EINVAL , dev, prop, str); +g_free (str); +} + +const PropertyInfo qdev_prop_macaddr = { + .name ="str" , + .description ="Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56" , + .get = get_mac, + .set = set_mac, +}; + +void qdev_prop_set_macaddr (DeviceState *dev,const char *name, +const uint8_t *value) +{ +char str[2 *6 +5 +1 ]; +snprintf (str,sizeof (str),"%02x:%02x:%02x:%02x:%02x:%02x" , + value[0 ], value[1 ], value[2 ], value[3 ], value[4 ], value[5 ]); + +object_property_set_str (OBJECT (dev), str, name, &error_abort); +} +/* --- netdev device --- */ static void get_netdev (Object *obj,Visitor *v,const char *name,void *opaque,Error **errp)
@@ -456,3 +554,491 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd) } nd->instantiated =1 ; } + +/* --- lost tick policy --- */ + +QEMU_BUILD_BUG_ON (sizeof (LostTickPolicy) !=sizeof (int )); + +const PropertyInfo qdev_prop_losttickpolicy = { + .name ="LostTickPolicy" , + .enum_table = &LostTickPolicy_lookup, + .get = qdev_propinfo_get_enum, + .set = qdev_propinfo_set_enum, + .set_default_value = qdev_propinfo_set_default_value_enum, +}; + +/* --- Block device error handling policy --- */ + +QEMU_BUILD_BUG_ON (sizeof (BlockdevOnError) !=sizeof (int )); + +const PropertyInfo qdev_prop_blockdev_on_error = { + .name ="BlockdevOnError" , + .description ="Error handling policy, " +"report/ignore/enospc/stop/auto" , + .enum_table = &BlockdevOnError_lookup, + .get = qdev_propinfo_get_enum, + .set = qdev_propinfo_set_enum, + .set_default_value = qdev_propinfo_set_default_value_enum, +}; + +/* --- BIOS CHS translation */ + +QEMU_BUILD_BUG_ON (sizeof (BiosAtaTranslation) !=sizeof (int )); + +const PropertyInfo qdev_prop_bios_chs_trans = { + .name ="BiosAtaTranslation" , + .description ="Logical CHS translation algorithm, " +"auto/none/lba/large/rechs" , + .enum_table = &BiosAtaTranslation_lookup, + .get = qdev_propinfo_get_enum, + .set = qdev_propinfo_set_enum, + .set_default_value = qdev_propinfo_set_default_value_enum, +}; + +/* --- FDC default drive types */ + +const PropertyInfo qdev_prop_fdc_drive_type = { + .name ="FdcDriveType" , + .description ="FDC drive type, " +"144/288/120/none/auto" , + .enum_table = &FloppyDriveType_lookup, + .get = qdev_propinfo_get_enum, + .set = qdev_propinfo_set_enum, + .set_default_value = qdev_propinfo_set_default_value_enum, +}; + +/* --- blocksize --- */ + +static void set_blocksize (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +uint16_t value, *ptr =qdev_get_prop_ptr (dev, prop); +Error *local_err =NULL ; +const int64_t min =512 ; +const int64_t max =32768 ; + +if (dev->realized) { +qdev_prop_set_after_realize (dev, name, errp); +return ; + } + +visit_type_uint16 (v, name, &value, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } +/* value of 0 means "unset" */ +if (value && (value < min || value > max)) { +error_setg (errp,QERR_PROPERTY_VALUE_OUT_OF_RANGE , + dev->id ? :"" , name, (int64_t )value, min, max); +return ; + } + +/* We rely on power-of-2 blocksizes for bitmasks */ +if ((value & (value -1 )) !=0 ) { +error_setg (errp, +"Property %s.%s doesn't take value '%" PRId64"', " +"it's not a power of 2" , dev->id ?:"" , name, (int64_t )value); +return ; + } + + *ptr = value; +} + +const PropertyInfo qdev_prop_blocksize = { + .name ="uint16" , + .description ="A power of two between 512 and 32768" , + .get = qdev_propinfo_get_uint16, + .set = set_blocksize, + .set_default_value = qdev_propinfo_set_default_value_uint, +}; + +/* --- MultiFDCompression --- */ + +const PropertyInfo qdev_prop_multifd_compression = { + .name ="MultiFDCompression" , + .description ="multifd_compression values, " +"none/zlib/zstd" , + .enum_table = &MultiFDCompression_lookup, + .get = qdev_propinfo_get_enum, + .set = qdev_propinfo_set_enum, + .set_default_value = qdev_propinfo_set_default_value_enum, +}; + +/* --- pci address --- */ + +/* +* bus-local address, i.e. "$slot" or "$slot.$fn" +*/ +static void set_pci_devfn (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +int32_t value, *ptr =qdev_get_prop_ptr (dev, prop); +unsigned int slot, fn, n; +Error *local_err =NULL ; +char *str; + +if (dev->realized) { +qdev_prop_set_after_realize (dev, name, errp); +return ; + } + +visit_type_str (v, name, &str, &local_err); +if (local_err) { +error_free (local_err); + local_err =NULL ; +visit_type_int32 (v, name, &value, &local_err); +if (local_err) { +error_propagate (errp, local_err); + }else if (value <-1 || value >255 ) { +error_setg (errp,QERR_INVALID_PARAMETER_VALUE , + name ? name :"null" ,"pci_devfn" ); + }else { + *ptr = value; + } +return ; + } + +if (sscanf (str,"%x.%x%n" , &slot, &fn, &n) !=2 ) { + fn =0 ; +if (sscanf (str,"%x%n" , &slot, &n) !=1 ) { + goto invalid; + } + } +if (str[n] !='\0' || fn >7 || slot >31 ) { + goto invalid; + } + *ptr = slot <<3 | fn; +g_free (str); +return ; + +invalid: +error_set_from_qdev_prop_error (errp,EINVAL , dev, prop, str); +g_free (str); +} + +static int print_pci_devfn (DeviceState *dev,Property *prop,char *dest, +size_t len) +{ +int32_t *ptr =qdev_get_prop_ptr (dev, prop); + +if (*ptr ==-1 ) { +return snprintf (dest, len,"<unset>" ); + }else { +return snprintf (dest, len,"%02x.%x" , *ptr >>3 , *ptr &7 ); + } +} + +const PropertyInfo qdev_prop_pci_devfn = { + .name ="int32" , + .description ="Slot and optional function number, example: 06.0 or 06" , + .print = print_pci_devfn, + .get = qdev_propinfo_get_int32, + .set = set_pci_devfn, + .set_default_value = qdev_propinfo_set_default_value_int, +}; + +/* --- pci host address --- */ + +static void get_pci_host_devaddr (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +PCIHostDeviceAddress *addr =qdev_get_prop_ptr (dev, prop); +char buffer[] ="ffff:ff:ff.f" ; +char *p = buffer; +int rc =0 ; + +/* +* Catch "invalid" device reference from vfio-pci and allow the +* default buffer representing the non-existent device to be used. +*/ +if (~addr->domain || ~addr->bus || ~addr->slot || ~addr->function) { + rc =snprintf (buffer,sizeof (buffer),"%04x:%02x:%02x.%0d" , + addr->domain, addr->bus, addr->slot, addr->function); +assert (rc ==sizeof (buffer) -1 ); + } + +visit_type_str (v, name, &p, errp); +} + +/* +* Parse [<domain>:]<bus>:<slot>.<func> +* if <domain> is not supplied, it's assumed to be 0. +*/ +static void set_pci_host_devaddr (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +PCIHostDeviceAddress *addr =qdev_get_prop_ptr (dev, prop); +Error *local_err =NULL ; +char *str, *p; +const char *e; +unsigned long val; +unsigned long dom =0 , bus =0 ; +unsigned long slot =0 , func =0 ; + +if (dev->realized) { +qdev_prop_set_after_realize (dev, name, errp); +return ; + } + +visit_type_str (v, name, &str, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + + p = str; +if (qemu_strtoul (p, &e,16 , &val) <0 ) { + goto inval; + } +if (*e !=':' ) { + goto inval; + } + bus = val; + + p = (char *)e +1 ; +if (qemu_strtoul (p, &e,16 , &val) <0 ) { + goto inval; + } +if (*e ==':' ) { + dom = bus; + bus = val; + p = (char *)e +1 ; +if (qemu_strtoul (p, &e,16 , &val) <0 ) { + goto inval; + } + } + slot = val; + +if (*e !='.' ) { + goto inval; + } + p = (char *)e +1 ; +if (qemu_strtoul (p, &e,10 , &val) <0 ) { + goto inval; + } + func = val; + +if (dom >0xffff || bus >0xff || slot >0x1f || func >7 ) { + goto inval; + } + +if (*e) { + goto inval; + } + + addr->domain = dom; + addr->bus = bus; + addr->slot = slot; + addr->function = func; + +g_free (str); +return ; + +inval: +error_set_from_qdev_prop_error (errp,EINVAL , dev, prop, str); +g_free (str); +} + +const PropertyInfo qdev_prop_pci_host_devaddr = { + .name ="str" , + .description ="Address (bus/device/function) of " +"the host device, example: 04:10.0" , + .get = get_pci_host_devaddr, + .set = set_pci_host_devaddr, +}; + +/* --- OffAutoPCIBAR off/auto/bar0/bar1/bar2/bar3/bar4/bar5 --- */ + +const PropertyInfo qdev_prop_off_auto_pcibar = { + .name ="OffAutoPCIBAR" , + .description ="off/auto/bar0/bar1/bar2/bar3/bar4/bar5" , + .enum_table = &OffAutoPCIBAR_lookup, + .get = qdev_propinfo_get_enum, + .set = qdev_propinfo_set_enum, + .set_default_value = qdev_propinfo_set_default_value_enum, +}; + +/* --- PCIELinkSpeed 2_5/5/8/16 -- */ + +static void get_prop_pcielinkspeed (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +PCIExpLinkSpeed *p =qdev_get_prop_ptr (dev, prop); +int speed; + +switch (*p) { +case QEMU_PCI_EXP_LNK_2_5GT : + speed =PCIE_LINK_SPEED_2_5 ; +break ; +case QEMU_PCI_EXP_LNK_5GT : + speed =PCIE_LINK_SPEED_5 ; +break ; +case QEMU_PCI_EXP_LNK_8GT : + speed =PCIE_LINK_SPEED_8 ; +break ; +case QEMU_PCI_EXP_LNK_16GT : + speed =PCIE_LINK_SPEED_16 ; +break ; +default : +/* Unreachable */ +abort (); + } + +visit_type_enum (v, prop->name, &speed, prop->info->enum_table, errp); +} + +static void set_prop_pcielinkspeed (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +PCIExpLinkSpeed *p =qdev_get_prop_ptr (dev, prop); +int speed; +Error *local_err =NULL ; + +if (dev->realized) { +qdev_prop_set_after_realize (dev, name, errp); +return ; + } + +visit_type_enum (v, prop->name, &speed, prop->info->enum_table, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + +switch (speed) { +case PCIE_LINK_SPEED_2_5 : + *p =QEMU_PCI_EXP_LNK_2_5GT ; +break ; +case PCIE_LINK_SPEED_5 : + *p =QEMU_PCI_EXP_LNK_5GT ; +break ; +case PCIE_LINK_SPEED_8 : + *p =QEMU_PCI_EXP_LNK_8GT ; +break ; +case PCIE_LINK_SPEED_16 : + *p =QEMU_PCI_EXP_LNK_16GT ; +break ; +default : +/* Unreachable */ +abort (); + } +} + +const PropertyInfo qdev_prop_pcie_link_speed = { + .name ="PCIELinkSpeed" , + .description ="2_5/5/8/16" , + .enum_table = &PCIELinkSpeed_lookup, + .get = get_prop_pcielinkspeed, + .set = set_prop_pcielinkspeed, + .set_default_value = qdev_propinfo_set_default_value_enum, +}; + +/* --- PCIELinkWidth 1/2/4/8/12/16/32 -- */ + +static void get_prop_pcielinkwidth (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +PCIExpLinkWidth *p =qdev_get_prop_ptr (dev, prop); +int width; + +switch (*p) { +case QEMU_PCI_EXP_LNK_X1 : + width =PCIE_LINK_WIDTH_1 ; +break ; +case QEMU_PCI_EXP_LNK_X2 : + width =PCIE_LINK_WIDTH_2 ; +break ; +case QEMU_PCI_EXP_LNK_X4 : + width =PCIE_LINK_WIDTH_4 ; +break ; +case QEMU_PCI_EXP_LNK_X8 : + width =PCIE_LINK_WIDTH_8 ; +break ; +case QEMU_PCI_EXP_LNK_X12 : + width =PCIE_LINK_WIDTH_12 ; +break ; +case QEMU_PCI_EXP_LNK_X16 : + width =PCIE_LINK_WIDTH_16 ; +break ; +case QEMU_PCI_EXP_LNK_X32 : + width =PCIE_LINK_WIDTH_32 ; +break ; +default : +/* Unreachable */ +abort (); + } + +visit_type_enum (v, prop->name, &width, prop->info->enum_table, errp); +} + +static void set_prop_pcielinkwidth (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +DeviceState *dev =DEVICE (obj); +Property *prop = opaque; +PCIExpLinkWidth *p =qdev_get_prop_ptr (dev, prop); +int width; +Error *local_err =NULL ; + +if (dev->realized) { +qdev_prop_set_after_realize (dev, name, errp); +return ; + } + +visit_type_enum (v, prop->name, &width, prop->info->enum_table, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + +switch (width) { +case PCIE_LINK_WIDTH_1 : + *p =QEMU_PCI_EXP_LNK_X1 ; +break ; +case PCIE_LINK_WIDTH_2 : + *p =QEMU_PCI_EXP_LNK_X2 ; +break ; +case PCIE_LINK_WIDTH_4 : + *p =QEMU_PCI_EXP_LNK_X4 ; +break ; +case PCIE_LINK_WIDTH_8 : + *p =QEMU_PCI_EXP_LNK_X8 ; +break ; +case PCIE_LINK_WIDTH_12 : + *p =QEMU_PCI_EXP_LNK_X12 ; +break ; +case PCIE_LINK_WIDTH_16 : + *p =QEMU_PCI_EXP_LNK_X16 ; +break ; +case PCIE_LINK_WIDTH_32 : + *p =QEMU_PCI_EXP_LNK_X32 ; +break ; +default : +/* Unreachable */ +abort (); + } +} + +const PropertyInfo qdev_prop_pcie_link_width = { + .name ="PCIELinkWidth" , + .description ="1/2/4/8/12/16/32" , + .enum_table = &PCIELinkWidth_lookup, + .get = get_prop_pcielinkwidth, + .set = set_prop_pcielinkwidth, + .set_default_value = qdev_propinfo_set_default_value_enum, +};
hw/core/qdev-properties.c +0 -590
622 lines not on this page · raw message
Signature · 1 line
2.21.1
PATCH v2 1/9 hw/core/qdev-properties: Use qemu_strtol() in set_mac() handler
In reply to Philippe Mathieu-DaudéThe MACAddr structure contains an array of uint8_t. Previously if a value was out of the [0..255] range, it was silently casted and no input validation was done.
Replace strtol() by qemu_strtol() -- so checkpatch.pl won't complain if we move this code later -- and return EINVAL if the input is invalid.
---
v2: Comment we added input validation (rth)
--- hw/core/qdev-properties.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
hw/core/qdev-properties.c +9 -2
@@ -1,4 +1,5 @@#include "qemu/osdep.h" +#include "qemu/cutils.h" #include "net/net.h" #include "hw/qdev-properties.h" #include "qapi/error.h"
@@ -532,7 +533,8 @@ static void set_mac(Object *obj, Visitor *v, const char *name, void *opaque,MACAddr *mac =qdev_get_prop_ptr (dev, prop);Error *local_err =NULL ;int i, pos; -char *str, *p; +char *str; +const char *p;if (dev->realized) {qdev_prop_set_after_realize (dev, name, errp);
@@ -546,6 +548,8 @@ static void set_mac(Object *obj, Visitor *v, const char *name, void *opaque, }for (i =0 , pos =0 ; i <6 ; i++, pos +=3 ) { +long val; +if (!qemu_isxdigit (str[pos])) { goto inval; }
@@ -561,7 +565,10 @@ static void set_mac(Object *obj, Visitor *v, const char *name, void *opaque, goto inval; } } - mac->a[i] =strtol (str+pos, &p,16 ); +if (qemu_strtol (str + pos, &p,16 , &val) <0 || val >0xff ) { + goto inval; + } + mac->a[i] = val; }g_free (str);return ;
Signature · 1 line
2.21.1
v2 cover user-mode: Prune build dependencies (part 3)
This is the second part of a series reducing user-mode dependencies. By stripping out unused code, the build and testing time is reduced (as is space used by objects).
Part 3:
- Extract code not related to user-mode from hw/core/qdev-properties.c
- Reduce user-mode QAPI generated files
Since v1:
- Addressed Richard and Paolo review comments
Patch missing review: #2 'Use qemu_strtoul() in set_pci_host_devaddr()'
v1: https://www.mail-archive.com/[email protected]/msg688486.html
full series available at:
repo: https://github.com/philmd/qemu/
branch: usermode_pruning-v2
Based-on: <[email protected]>
Philippe Mathieu-Daudé (9):
hw/core/qdev-properties: Use qemu_strtol() in set_mac() handler hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr() hw/core/qdev-properties: Fix code style hw/core/qdev-properties: Export enum-related functions hw/core/qdev-properties: Export qdev_prop_enum hw/core/qdev-properties: Export some integer-related functions hw/core/qdev-properties: Extract system-mode specific properties hw/core: Add qdev stub for user-mode
qapi: Restrict code generated for user-mode
hw/core/qdev-prop-internal.h | 28 ++ include/hw/qdev-properties.h | 1 + hw/core/qdev-properties-system.c | 602 ++++++++++++++++++++++++++++- hw/core/qdev-properties.c | 643 ++----------------------------- hw/core/qdev-stubs.c | 20 + hw/core/Makefile.objs | 3 + qapi/Makefile.objs | 37 +- 7 files changed, 714 insertions(+), 620 deletions(-) create mode 100644 hw/core/qdev-prop-internal.h create mode 100644 hw/core/qdev-stubs.c
Signature · 1 line
2.21.1
PATCH v2 9/9 qapi: Restrict code generated for user-mode
A lot of QAPI generated code is never used by user-mode.
Rewrite the QAPI_COMMON_MODULES variable one entry per line, and split it in 3 groups:
- always used
- use by system-mode or tools
- only used by system-mode
--- qapi/Makefile.objs | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-)
qapi/Makefile.objs +33 -4
@@ -5,11 +5,40 @@ util-obj-y += opts-visitor.o qapi-clone-visitor.o util-obj-y += qmp-event.o util-obj-y += qapi-util.o -QAPI_COMMON_MODULES = audio authz block-core block char common control crypto -QAPI_COMMON_MODULES += dump error introspect job machine migration misc -QAPI_COMMON_MODULES += net pragma qdev qom rdma rocker run-state sockets tpm -QAPI_COMMON_MODULES += trace transaction ui +QAPI_COMMON_MODULES = common +QAPI_COMMON_MODULES += introspect +QAPI_COMMON_MODULES += misc + +ifeq ($(CONFIG_SOFTMMU),y) +QAPI_COMMON_MODULES += audio +QAPI_COMMON_MODULES += dump +QAPI_COMMON_MODULES += machine +QAPI_COMMON_MODULES += migration +QAPI_COMMON_MODULES += net rocker +QAPI_COMMON_MODULES += qdev +QAPI_COMMON_MODULES += rdma +QAPI_COMMON_MODULES += tpm +QAPI_COMMON_MODULES += trace +QAPI_COMMON_MODULES += ui QAPI_TARGET_MODULES = machine-target misc-target +endif # CONFIG_SOFTMMU + +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) +QAPI_COMMON_MODULES += authz +QAPI_COMMON_MODULES += block +QAPI_COMMON_MODULES += block-core +QAPI_COMMON_MODULES += char +QAPI_COMMON_MODULES += control +QAPI_COMMON_MODULES += crypto +QAPI_COMMON_MODULES += error +QAPI_COMMON_MODULES += job +QAPI_COMMON_MODULES += pragma +QAPI_COMMON_MODULES += qom +QAPI_COMMON_MODULES += run-state +QAPI_COMMON_MODULES += sockets +QAPI_COMMON_MODULES += transaction +endif # CONFIG_SOFTMMU || CONFIG_TOOLS + QAPI_MODULES = $(QAPI_COMMON_MODULES) $(QAPI_TARGET_MODULES) util-obj-y += qapi-builtin-types.o
Signature · 1 line
2.21.1
PATCH v2 3/9 hw/core/qdev-properties: Fix code style
In reply to Philippe Mathieu-DaudéWe will soon move this code, fix its style to avoid checkpatch.pl to complain.
--- hw/core/qdev-properties.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
hw/core/qdev-properties.c +5 -5
@@ -553,15 +553,15 @@ static void set_mac(Object *obj, Visitor *v, const char *name, void *opaque,if (!qemu_isxdigit (str[pos])) { goto inval; } -if (!qemu_isxdigit (str[pos+1 ])) { +if (!qemu_isxdigit (str[pos +1 ])) { goto inval; }if (i ==5 ) { -if (str[pos+2 ] !='\0' ) { +if (str[pos +2 ] !='\0' ) { goto inval; } }else { -if (str[pos+2 ] !=':' && str[pos+2 ] !='-' ) { +if (str[pos +2 ] !=':' && str[pos +2 ] !='-' ) { goto inval; } }
@@ -767,8 +767,8 @@ static void set_blocksize(Object *obj, Visitor *v, const char *name,/* We rely on power-of-2 blocksizes for bitmasks */ if ((value & (value -1 )) !=0 ) {error_setg (errp, -"Property %s.%s doesn't take value '%" PRId64"', it's not a power of 2" , - dev->id ?:"" , name, (int64_t )value); +"Property %s.%s doesn't take value '%" PRId64"', " +"it's not a power of 2" , dev->id ?:"" , name, (int64_t )value);return ; }
Signature · 1 line
2.21.1
PATCH v2 4/9 hw/core/qdev-properties: Export enum-related functions
In reply to Philippe Mathieu-DaudéWe are going to split this file and reuse these static functions. Add the local "qdev-prop-internal.h" header declaring them.
--- hw/core/qdev-prop-internal.h | 19 ++++++++++++ hw/core/qdev-properties.c | 58 +++++++++++++++++++----------------- 2 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 hw/core/qdev-prop-internal.h
hw/core/qdev-prop-internal.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* qdev property parsing +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifndef HW_CORE_QDEV_PROP_INTERNAL_H +#define HW_CORE_QDEV_PROP_INTERNAL_H + +void qdev_propinfo_get_enum (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp); +void qdev_propinfo_set_enum (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp); + +void qdev_propinfo_set_default_value_enum (ObjectProperty *op, +const Property *prop); + +#endif
hw/core/qdev-properties.c +30 -28
134 lines not on this page · raw message
Signature · 1 line
2.21.1
PATCH v2 2/9 hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()
In reply to Philippe Mathieu-DaudéReplace strtoul() by qemu_strtoul() so checkpatch.pl won't complain if we move this code later. Increase the slot and func local variables to unsigned long so that the range check isn't truncated. Remove the 'e == p' test which is done in check_strtox_error(), called by qemu_strtoul().
---
v2: drop the e == p test, do not do modify range check (rth)
--- hw/core/qdev-properties.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
hw/core/qdev-properties.c +12 -13
@@ -820,10 +820,10 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,PCIHostDeviceAddress *addr =qdev_get_prop_ptr (dev, prop);Error *local_err =NULL ;char *str, *p; -char *e; +const char *e;unsigned long val;unsigned long dom =0 , bus =0 ; -unsigned int slot =0 , func =0 ; +unsigned long slot =0 , func =0 ;if (dev->realized) {qdev_prop_set_after_realize (dev, name, errp);
@@ -837,23 +837,23 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name, } p = str; - val =strtoul (p, &e,16 ); -if (e == p || *e !=':' ) { +if (qemu_strtoul (p, &e,16 , &val) <0 ) { + goto inval; + } +if (*e !=':' ) { goto inval; } bus = val; - p = e +1 ; - val =strtoul (p, &e,16 ); -if (e == p) { + p = (char *)e +1 ; +if (qemu_strtoul (p, &e,16 , &val) <0 ) { goto inval; }if (*e ==':' ) { dom = bus; bus = val; - p = e +1 ; - val =strtoul (p, &e,16 ); -if (e == p) { + p = (char *)e +1 ; +if (qemu_strtoul (p, &e,16 , &val) <0 ) { goto inval; } }
@@ -862,9 +862,8 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, const char *name,if (*e !='.' ) { goto inval; } - p = e +1 ; - val =strtoul (p, &e,10 ); -if (e == p) { + p = (char *)e +1 ; +if (qemu_strtoul (p, &e,10 , &val) <0 ) { goto inval; } func = val;
Signature · 1 line
2.21.1
PATCH v2 5/9 hw/core/qdev-properties: Export qdev_prop_enum
In reply to Philippe Mathieu-Daudé--- include/hw/qdev-properties.h | 1 + hw/core/qdev-properties.c | 7 +++++++ 2 files changed, 8 insertions(+)
include/hw/qdev-properties.h +1 -0
@@ -8,6 +8,7 @@extern const PropertyInfo qdev_prop_bit;extern const PropertyInfo qdev_prop_bit64;extern const PropertyInfo qdev_prop_bool; +extern const PropertyInfo qdev_prop_enum;extern const PropertyInfo qdev_prop_uint8;extern const PropertyInfo qdev_prop_uint16;extern const PropertyInfo qdev_prop_uint32;
hw/core/qdev-properties.c +7 -0
@@ -84,6 +84,13 @@ void qdev_propinfo_set_default_value_enum(ObjectProperty *op, qapi_enum_lookup(prop->info->enum_table, prop->defval.i)); } +const PropertyInfo qdev_prop_enum = { + .name ="enum" , + .get = qdev_propinfo_get_enum, + .set = qdev_propinfo_set_enum, + .set_default_value = qdev_propinfo_set_default_value_enum, +}; +/* Bit */ static uint32_t qdev_get_prop_mask (Property *prop)
Signature · 1 line
2.21.1
PATCH v2 8/9 hw/core: Add qdev stub for user-mode
In reply to Philippe Mathieu-DaudéWhile user-mode does not use peripherals (devices), it uses a CPU which is a device.
In the next commit we will reduce the QAPI generated code for user-mode. Since qdev.c calls qapi_event_send_device_deleted(), let's add a stub for it.
---
v2: use common-obj-$(CONFIG_ALL) (Paolo)
--- hw/core/qdev-stubs.c | 20 ++++++++++++++++++++ hw/core/Makefile.objs | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 hw/core/qdev-stubs.c
hw/core/qdev-stubs.c new file +20 -0
@@ -0,0 +1,20 @@ +/* +* QAPI qdev stubs +* +* Copyright (c) 2020 Red Hat, Inc. +* +* Author: +* Philippe Mathieu-Daudé <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "qapi/qapi-events-qdev.h" + +void qapi_event_send_device_deleted (bool has_device, +const char *device,const char *path) +{ +}
hw/core/Makefile.objs +3 -0
@@ -31,3 +31,6 @@ common-obj-$(CONFIG_OR_IRQ) += or-irq.o common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o common-obj-$(CONFIG_GENERIC_LOADER) += generic-loader.o + +common-obj-$(call lnot,$(CONFIG_SOFTMMU)) += qdev-stubs.o +common-obj-$(CONFIG_ALL) += qdev-stubs.o
Signature · 1 line
2.21.1
Re: [PATCH v2 2/9] hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()
In reply to Philippe Mathieu-DaudéQuoted 6 lines · Philippe Mathieu-Daudé
Replace
strtoul()byqemu_strtoul()so checkpatch.pl won't complain if we move this code later. Increase the slot and func local variables to unsigned long so that the range check isn't truncated. Remove the 'e == p' test which is done incheck_strtox_error(), called byqemu_strtoul().
Quoted 6 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v2: drop the e == p test, do not do modify range check (rth)--- hw/core/qdev-properties.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
r~
Re: [PATCH v2 8/9] hw/core: Add qdev stub for user-mode
In reply to Philippe Mathieu-DaudéQuoted 8 lines · Philippe Mathieu-Daudé
While user-mode does not use peripherals (devices), it uses a CPU which is a device.
In the next commit we will reduce the QAPI generated code for user-mode. Sinceqdev.ccallsqapi_event_send_device_deleted(), let's add a stub for it.Suggested-by Paolo Bonzini <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 7 lines
---
v2: use common-obj-$(CONFIG_ALL) (Paolo)--- hw/core/qdev-stubs.c | 20 ++++++++++++++++++++ hw/core/Makefile.objs | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 hw/core/qdev-stubs.c
r~
Hi Eduardo,
Quoted 21 lines · Philippe Mathieu-Daudé
This is the second part of a series reducing user-mode dependencies. By stripping out unused code, the build and testing time is reduced (as is space used by objects).
Part 3:
- Extract code not related to user-mode fromhw/core/qdev-properties.c
- Reduce user-mode QAPI generated filesSince v1:
- Addressed Richard and Paolo review commentsPatch missing review: #2 'Use
qemu_strtoul()inset_pci_host_devaddr()'v1: https://www.mail-archive.com/[email protected]/msg688486.html
full series available at:
repo: https://github.com/philmd/qemu/
branch: usermode_pruning-v2Based-on: <[email protected]>
Quoted 8 lines
Philippe Mathieu-Daudé (9):
hw/core/qdev-properties: Useqemu_strtol()inset_mac()handler hw/core/qdev-properties: Useqemu_strtoul()inset_pci_host_devaddr()hw/core/qdev-properties: Fix code style hw/core/qdev-properties: Export enum-related functions hw/core/qdev-properties: Exportqdev_prop_enumhw/core/qdev-properties: Export some integer-related functions hw/core/qdev-properties: Extract system-mode specific properties
If you have to respin "x86 and machine queue" please consider including reviewed patches 1-7 :)
Quoted 14 lines
hw/core: Add qdev stub for user-mode
qapi: Restrict code generated for user-modehw/core/qdev-prop-internal.h | 28 ++ include/hw/qdev-properties.h | 1 + hw/core/qdev-properties-system.c | 602 ++++++++++++++++++++++++++++- hw/core/qdev-properties.c | 643 ++----------------------------- hw/core/qdev-stubs.c | 20 + hw/core/Makefile.objs | 3 + qapi/Makefile.objs | 37 +- 7 files changed, 714 insertions(+), 620 deletions(-)create mode 100644
hw/core/qdev-prop-internal.h
create mode 100644hw/core/qdev-stubs.c