From patchwork Mon Dec 12 20:18:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,063/197] make spapr a bit more patch monkey friendly Date: Mon, 12 Dec 2011 10:18:59 -0000 From: Anthony Liguori X-Patchwork-Id: 130896 Message-Id: <1323721273-32404-64-git-send-email-aliguori@us.ibm.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Stefan Hajnoczi , Jan Kiszka , Markus Armbruster , Luiz Capitulino --- hw/spapr_llan.c | 4 ++-- hw/spapr_vscsi.c | 4 ++-- hw/spapr_vty.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/spapr_llan.c b/hw/spapr_llan.c index abe1297..958702c 100644 --- a/hw/spapr_llan.c +++ b/hw/spapr_llan.c @@ -484,7 +484,7 @@ static void vlan_hcalls(VIOsPAPRBus *bus) spapr_register_hypercall(H_MULTICAST_CTRL, h_multicast_ctrl); } -static VIOsPAPRDeviceInfo spapr_vlan = { +static VIOsPAPRDeviceInfo spapr_vlan_info = { .init = spapr_vlan_init, .devnode = spapr_vlan_devnode, .dt_name = "l-lan", @@ -503,6 +503,6 @@ static VIOsPAPRDeviceInfo spapr_vlan = { static void spapr_vlan_register(void) { - spapr_vio_bus_register_withprop(&spapr_vlan); + spapr_vio_bus_register_withprop(&spapr_vlan_info); } device_init(spapr_vlan_register); diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c index 00e2d2d..21d946e 100644 --- a/hw/spapr_vscsi.c +++ b/hw/spapr_vscsi.c @@ -947,7 +947,7 @@ static int spapr_vscsi_devnode(VIOsPAPRDevice *dev, void *fdt, int node_off) return 0; } -static VIOsPAPRDeviceInfo spapr_vscsi = { +static VIOsPAPRDeviceInfo spapr_vscsi_info = { .init = spapr_vscsi_init, .devnode = spapr_vscsi_devnode, .dt_name = "v-scsi", @@ -964,6 +964,6 @@ static VIOsPAPRDeviceInfo spapr_vscsi = { static void spapr_vscsi_register(void) { - spapr_vio_bus_register_withprop(&spapr_vscsi); + spapr_vio_bus_register_withprop(&spapr_vscsi_info); } device_init(spapr_vscsi_register); diff --git a/hw/spapr_vty.c b/hw/spapr_vty.c index f23cc36..fddecd8 100644 --- a/hw/spapr_vty.c +++ b/hw/spapr_vty.c @@ -141,7 +141,7 @@ static void vty_hcalls(VIOsPAPRBus *bus) spapr_register_hypercall(H_GET_TERM_CHAR, h_get_term_char); } -static VIOsPAPRDeviceInfo spapr_vty = { +static VIOsPAPRDeviceInfo spapr_vty_info = { .init = spapr_vty_init, .dt_name = "vty", .dt_type = "serial", @@ -181,6 +181,6 @@ static VIOsPAPRDevice *vty_lookup(sPAPREnvironment *spapr, target_ulong reg) static void spapr_vty_register(void) { - spapr_vio_bus_register_withprop(&spapr_vty); + spapr_vio_bus_register_withprop(&spapr_vty_info); } device_init(spapr_vty_register);