[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/58] spapr: prepare for qdevification of irq
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 02/58] spapr: prepare for qdevification of irq |
Date: |
Wed, 14 Sep 2011 10:42:26 +0200 |
From: Paolo Bonzini <address@hidden>
Restructure common properties for sPAPR devices so that IRQ definitions
can be added in one place.
Signed-off-by: Paolo Bonzini <address@hidden>
Cc: Alexander Graf <address@hidden>
Cc: David Gibson <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/spapr_llan.c | 4 +---
hw/spapr_vio.h | 5 +++++
hw/spapr_vscsi.c | 4 +---
hw/spapr_vty.c | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/hw/spapr_llan.c b/hw/spapr_llan.c
index 2597748..abe1297 100644
--- a/hw/spapr_llan.c
+++ b/hw/spapr_llan.c
@@ -495,9 +495,7 @@ static VIOsPAPRDeviceInfo spapr_vlan = {
.qdev.name = "spapr-vlan",
.qdev.size = sizeof(VIOsPAPRVLANDevice),
.qdev.props = (Property[]) {
- DEFINE_PROP_UINT32("reg", VIOsPAPRDevice, reg, 0x1000),
- DEFINE_PROP_UINT32("dma-window", VIOsPAPRDevice, rtce_window_size,
- 0x10000000),
+ DEFINE_SPAPR_PROPERTIES(VIOsPAPRVLANDevice, sdev, 0x1000, 0x10000000),
DEFINE_NIC_PROPERTIES(VIOsPAPRVLANDevice, nicconf),
DEFINE_PROP_END_OF_LIST(),
},
diff --git a/hw/spapr_vio.h b/hw/spapr_vio.h
index faa5d94..7eb5367 100644
--- a/hw/spapr_vio.h
+++ b/hw/spapr_vio.h
@@ -60,6 +60,11 @@ typedef struct VIOsPAPRDevice {
VIOsPAPR_CRQ crq;
} VIOsPAPRDevice;
+#define DEFINE_SPAPR_PROPERTIES(type, field, default_reg, default_dma_window) \
+ DEFINE_PROP_UINT32("reg", type, field.reg, default_reg), \
+ DEFINE_PROP_UINT32("dma-window", type, field.rtce_window_size, \
+ default_dma_window)
+
typedef struct VIOsPAPRBus {
BusState bus;
int irq;
diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c
index d2d0415..6fc82f6 100644
--- a/hw/spapr_vscsi.c
+++ b/hw/spapr_vscsi.c
@@ -930,9 +930,7 @@ static VIOsPAPRDeviceInfo spapr_vscsi = {
.qdev.name = "spapr-vscsi",
.qdev.size = sizeof(VSCSIState),
.qdev.props = (Property[]) {
- DEFINE_PROP_UINT32("reg", VIOsPAPRDevice, reg, 0x2000),
- DEFINE_PROP_UINT32("dma-window", VIOsPAPRDevice,
- rtce_window_size, 0x10000000),
+ DEFINE_SPAPR_PROPERTIES(VSCSIState, vdev, 0x2000, 0x10000000),
DEFINE_PROP_END_OF_LIST(),
},
};
diff --git a/hw/spapr_vty.c b/hw/spapr_vty.c
index 607b81b..a9d4b03 100644
--- a/hw/spapr_vty.c
+++ b/hw/spapr_vty.c
@@ -140,7 +140,7 @@ static VIOsPAPRDeviceInfo spapr_vty = {
.qdev.name = "spapr-vty",
.qdev.size = sizeof(VIOsPAPRVTYDevice),
.qdev.props = (Property[]) {
- DEFINE_PROP_UINT32("reg", VIOsPAPRDevice, reg, 0),
+ DEFINE_SPAPR_PROPERTIES(VIOsPAPRVTYDevice, sdev, 0, 0),
DEFINE_PROP_CHR("chardev", VIOsPAPRVTYDevice, chardev),
DEFINE_PROP_END_OF_LIST(),
},
--
1.6.0.2
- Re: [Qemu-devel] [Qemu-ppc] [PATCH 28/58] device tree: give dt more size, (continued)
- [Qemu-devel] [PATCH 35/58] PPC: SPAPR: Use KVM function for time info, Alexander Graf, 2011/09/14
- [Qemu-devel] [PATCH 14/58] device tree: add nop_node, Alexander Graf, 2011/09/14
- [Qemu-devel] [PATCH 38/58] pseries: interrupt controller should not have a 'reg' property, Alexander Graf, 2011/09/14
- [Qemu-devel] [PATCH 49/58] vscsi: send the CHECK_CONDITION status down together with autosense data, Alexander Graf, 2011/09/14
- [Qemu-devel] [PATCH 20/58] PPC: KVM: Remove kvmppc_read_host_property, Alexander Graf, 2011/09/14
- [Qemu-devel] [PATCH 40/58] PPC: Fix sync instructions problem in SMP, Alexander Graf, 2011/09/14
- [Qemu-devel] [PATCH 18/58] PPC: E500: Remove mpc8544_copy_soc_cell, Alexander Graf, 2011/09/14
- [Qemu-devel] [PATCH 02/58] spapr: prepare for qdevification of irq,
Alexander Graf <=
- [Qemu-devel] [PATCH 17/58] PPC: E500: Use generic kvm function for freq, Alexander Graf, 2011/09/14
- [Qemu-devel] [PATCH 48/58] pseries: Implement hcall-bulk hypervisor interface, Alexander Graf, 2011/09/14
- [Qemu-devel] [PATCH 50/58] pseries: Update SLOF firmware image, Alexander Graf, 2011/09/14
- Re: [Qemu-devel] [PATCH 50/58] pseries: Update SLOF firmware image, Peter Maydell, 2011/09/14
- Re: [Qemu-devel] [PATCH 50/58] pseries: Update SLOF firmware image, Alexander Graf, 2011/09/14
- Re: [Qemu-devel] [PATCH 50/58] pseries: Update SLOF firmware image, Peter Maydell, 2011/09/14
- Re: [Qemu-devel] [PATCH 50/58] pseries: Update SLOF firmware image, Anthony Liguori, 2011/09/14
- Re: [Qemu-devel] [PATCH 50/58] pseries: Update SLOF firmware image, Blue Swirl, 2011/09/14
- Re: [Qemu-devel] [PATCH 50/58] pseries: Update SLOF firmware image, Alexander Graf, 2011/09/19
- Re: [Qemu-devel] [Qemu-ppc] [PATCH 50/58] pseries: Update SLOF firmware image, David Gibson, 2011/09/20