[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/20] qdev: Coding style fixes
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 07/20] qdev: Coding style fixes |
Date: |
Wed, 19 Dec 2012 14:36:23 +0100 |
From: Eduardo Habkost <address@hidden>
Add missing braces and break lines larger than 80 chars.
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/qdev-properties.c | 53 +++++++++++++++++++++++++++++++++-----------------
hw/qdev.c | 3 ++-
2 Dateien geändert, 37 Zeilen hinzugefügt(+), 19 Zeilen entfernt(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 81d901c..67543fd 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -95,10 +95,11 @@ static void bit_prop_set(DeviceState *dev, Property *props,
bool val)
{
uint32_t *p = qdev_get_prop_ptr(dev, props);
uint32_t mask = qdev_get_prop_mask(props);
- if (val)
+ if (val) {
*p |= mask;
- else
+ } else {
*p &= ~mask;
+ }
}
static int print_bit(DeviceState *dev, Property *prop, char *dest, size_t len)
@@ -420,11 +421,13 @@ static void release_string(Object *obj, const char *name,
void *opaque)
g_free(*(char **)qdev_get_prop_ptr(DEVICE(obj), prop));
}
-static int print_string(DeviceState *dev, Property *prop, char *dest, size_t
len)
+static int print_string(DeviceState *dev, Property *prop, char *dest,
+ size_t len)
{
char **ptr = qdev_get_prop_ptr(dev, prop);
- if (!*ptr)
+ if (!*ptr) {
return snprintf(dest, len, "<null>");
+ }
return snprintf(dest, len, "\"%s\"", *ptr);
}
@@ -483,10 +486,12 @@ static int parse_drive(DeviceState *dev, const char *str,
void **ptr)
BlockDriverState *bs;
bs = bdrv_find(str);
- if (bs == NULL)
+ if (bs == NULL) {
return -ENOENT;
- if (bdrv_attach_dev(bs, dev) < 0)
+ }
+ if (bdrv_attach_dev(bs, dev) < 0) {
return -EEXIST;
+ }
*ptr = bs;
return 0;
}
@@ -749,16 +754,20 @@ static void set_mac(Object *obj, Visitor *v, void *opaque,
}
for (i = 0, pos = 0; i < 6; i++, pos += 3) {
- if (!qemu_isxdigit(str[pos]))
+ 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;
+ }
}
mac->a[i] = strtol(str+pos, &p, 16);
}
@@ -864,7 +873,8 @@ invalid:
g_free(str);
}
-static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest,
size_t len)
+static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest,
+ size_t len)
{
int32_t *ptr = qdev_get_prop_ptr(dev, prop);
@@ -1038,11 +1048,13 @@ PropertyInfo qdev_prop_pci_host_devaddr = {
static Property *qdev_prop_walk(Property *props, const char *name)
{
- if (!props)
+ if (!props) {
return NULL;
+ }
while (props->name) {
- if (strcmp(props->name, name) == 0)
+ if (strcmp(props->name, name) == 0) {
return props;
+ }
props++;
}
return NULL;
@@ -1158,7 +1170,8 @@ void qdev_prop_set_string(DeviceState *dev, const char
*name, const char *value)
assert_no_error(errp);
}
-int qdev_prop_set_drive(DeviceState *dev, const char *name, BlockDriverState
*value)
+int qdev_prop_set_drive(DeviceState *dev, const char *name,
+ BlockDriverState *value)
{
Error *errp = NULL;
const char *bdrv_name = value ? bdrv_get_device_name(value) : "";
@@ -1172,13 +1185,15 @@ int qdev_prop_set_drive(DeviceState *dev, const char
*name, BlockDriverState *va
return 0;
}
-void qdev_prop_set_drive_nofail(DeviceState *dev, const char *name,
BlockDriverState *value)
+void qdev_prop_set_drive_nofail(DeviceState *dev, const char *name,
+ BlockDriverState *value)
{
if (qdev_prop_set_drive(dev, name, value) < 0) {
exit(1);
}
}
-void qdev_prop_set_chr(DeviceState *dev, const char *name, CharDriverState
*value)
+void qdev_prop_set_chr(DeviceState *dev, const char *name,
+ CharDriverState *value)
{
Error *errp = NULL;
assert(!value || value->label);
@@ -1187,7 +1202,8 @@ void qdev_prop_set_chr(DeviceState *dev, const char
*name, CharDriverState *valu
assert_no_error(errp);
}
-void qdev_prop_set_netdev(DeviceState *dev, const char *name, NetClientState
*value)
+void qdev_prop_set_netdev(DeviceState *dev, const char *name,
+ NetClientState *value)
{
Error *errp = NULL;
assert(!value || value->name);
@@ -1229,7 +1245,8 @@ void qdev_prop_set_ptr(DeviceState *dev, const char
*name, void *value)
*ptr = value;
}
-static QTAILQ_HEAD(, GlobalProperty) global_props =
QTAILQ_HEAD_INITIALIZER(global_props);
+static QTAILQ_HEAD(, GlobalProperty) global_props =
+ QTAILQ_HEAD_INITIALIZER(global_props);
static void qdev_prop_register_global(GlobalProperty *prop)
{
diff --git a/hw/qdev.c b/hw/qdev.c
index 599382c..0f8b878 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -315,8 +315,9 @@ void qdev_connect_gpio_out(DeviceState * dev, int n,
qemu_irq pin)
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd)
{
qdev_prop_set_macaddr(dev, "mac", nd->macaddr.a);
- if (nd->netdev)
+ if (nd->netdev) {
qdev_prop_set_netdev(dev, "netdev", nd->netdev);
+ }
if (nd->nvectors != DEV_NVECTORS_UNSPECIFIED &&
object_property_find(OBJECT(dev), "vectors", NULL)) {
qdev_prop_set_uint32(dev, "vectors", nd->nvectors);
--
1.7.10.4
- [Qemu-devel] [PULL] QOM CPUState patch queue 2012-12-19, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 02/20] alpha: Pass AlphaCPU array to Typhoon, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 03/20] target-alpha: Avoid leaking the alarm timer over reset, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 06/20] cpu: Introduce CPUListState struct, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 05/20] target-alpha: Add support for -cpu ?, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 09/20] cpu: Move kvm_fd into CPUState, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 01/20] target-alpha: Let cpu_alpha_init() return AlphaCPU, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 04/20] target-alpha: Turn CPU definitions into subclasses, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 13/20] ppc: Pass PowerPCCPU to [h]decr callbacks, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 15/20] ppc_booke: Pass PowerPCCPU to {decr, fit, wdt} timer callbacks, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 07/20] qdev: Coding style fixes,
Andreas Färber <=
- [Qemu-devel] [PATCH 16/20] ppc4xx_devs: Return PowerPCCPU from ppc4xx_init(), Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 10/20] kvm: Pass CPUState to kvm_arch_*, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 12/20] ppc: Pass PowerPCCPU to ppc_set_irq(), Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 14/20] ppc: Pass PowerPCCPU to [h]decr timer callbacks, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 11/20] kvm: Pass CPUState to kvm_vcpu_ioctl(), Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 08/20] qdev-properties.c: Separate core from the code used only by qemu-system-*, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 20/20] MAINTAINERS: Include X86CPU in CPU maintenance area, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 18/20] cpu: Move kvm_state field into CPUState, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 19/20] cpu: Move kvm_run into CPUState, Andreas Färber, 2012/12/19
- [Qemu-devel] [PATCH 17/20] ppc_booke: Pass PowerPCCPU to ppc_booke_timers_init(), Andreas Färber, 2012/12/19