fixup some fallback from tree reorg
cover fixup some fallback from tree reorg
Here are some patches fixing up minor issues
in the tree reorganization.
Michael S. Tsirkin (2):
dec.c - move to pci-bridge
firmware_abi: move to include/hw/nvram/
hw/pci-bridge/Makefile.objs | 2 + hw/pci-bridge/dec.c | 156 +++++++++++++++++++++++++++++++ hw/pci-bridge/dec.h | 10 ++ hw/pci-host/Makefile.objs | 1 - hw/pci-host/dec.c | 156 ------------------------------- hw/pci-host/dec.h | 10 -- hw/sparc/sun4m.c | 2 +- hw/sparc64/sun4u.c | 2 +- include/hw/nvram/openbios_firmware_abi.h | 73 +++++++++++++++ include/hw/sparc/firmware_abi.h | 73 --------------- 10 files changed, 243 insertions(+), 242 deletions(-) create mode 100644 hw/pci-bridge/dec.c create mode 100644 hw/pci-bridge/dec.h delete mode 100644 hw/pci-host/dec.c delete mode 100644 hw/pci-host/dec.h create mode 100644 include/hw/nvram/openbios_firmware_abi.h delete mode 100644 include/hw/sparc/firmware_abi.h
Signature · 1 line
MST
PATCH 1/2 dec.c - move to pci-bridge
Looks like dec.c is in pci-host by mistake. Moving it over to pci-bridge.
--- hw/pci-bridge/Makefile.objs | 2 + hw/pci-bridge/dec.c | 156 ++++++++++++++++++++++++++++++++++++++++++++ hw/pci-bridge/dec.h | 10 +++ hw/pci-host/Makefile.objs | 1 - hw/pci-host/dec.c | 156 -------------------------------------------- hw/pci-host/dec.h | 10 --- 6 files changed, 168 insertions(+), 167 deletions(-) create mode 100644 hw/pci-bridge/dec.c create mode 100644 hw/pci-bridge/dec.h delete mode 100644 hw/pci-host/dec.c delete mode 100644 hw/pci-host/dec.h
hw/pci-bridge/Makefile.objs +2 -0
@@ -1,3 +1,5 @@ common-obj-y += pci_bridge_dev.o common-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o common-obj-y += i82801b11.o +# NewWorld PowerMac +common-obj-$(CONFIG_DEC_PCI) += dec.o
hw/pci-bridge/dec.c new file +156 -0
156 lines not on this page · raw message
hw/pci-bridge/dec.h new file +10 -0
@@ -0,0 +1,10 @@ +#ifndef DEC_PCI_H +#define DEC_PCI_H + +#include "qemu-common.h" + +#define TYPE_DEC_21154 "dec-21154-sysbus" + +PCIBus *pci_dec_21154_init (PCIBus *parent_bus,int devfn); + +#endif
hw/pci-host/Makefile.objs +0 -1
@@ -5,7 +5,6 @@ common-obj-$(CONFIG_PREP_PCI) += prep.o common-obj-$(CONFIG_GRACKLE_PCI) += grackle.o # NewWorld PowerMac common-obj-$(CONFIG_UNIN_PCI) += uninorth.o -common-obj-$(CONFIG_DEC_PCI) += dec.o # PowerPC E500 boards common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o
hw/pci-host/dec.c deleted +0 -156
156 lines not on this page · raw message
hw/pci-host/dec.h deleted +0 -10
@@ -1,10 +0,0 @@ -#ifndef DEC_PCI_H -#define DEC_PCI_H - -#include "qemu-common.h" - -#define TYPE_DEC_21154 "dec-21154-sysbus" - -PCIBus *pci_dec_21154_init (PCIBus *parent_bus,int devfn); - -#endif
Signature · 1 line
MST
Re: [Qemu-devel] [PATCH 1/2] dec.c - move to pci-bridge
Am 30.05.2013 11:30, schrieb Michael S. Tsirkin:
Quoted 5 lines
Looks like
dec.cis in pci-host by mistake.
Moving it over to pci-bridge.Cc Andreas Färber <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>
Quoted 12 lines
--- hw/pci-bridge/Makefile.objs | 2 + hw/pci-bridge/dec.c | 156 ++++++++++++++++++++++++++++++++++++++++++++ hw/pci-bridge/dec.h | 10 +++ hw/pci-host/Makefile.objs | 1 - hw/pci-host/dec.c | 156 -------------------------------------------- hw/pci-host/dec.h | 10 --- 6 files changed, 168 insertions(+), 167 deletions(-) create mode 100644 hw/pci-bridge/dec.c create mode 100644 hw/pci-bridge/dec.h delete mode 100644 hw/pci-host/dec.c delete mode 100644 hw/pci-host/dec.h
Unfortunately you seem to have rename detection disabled - if this is just a move of the file with includes adjusted then
Otherwise please supply a "readable" diff or point to a Git branch where we can check.
Thanks,
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH 1/2] dec.c - move to pci-bridge
Quoted 22 lines · Andreas Färber
Am 30.05.2013 11:30, schrieb Michael S. Tsirkin:
Quoted 5 lines
Looks like
dec.cis in pci-host by mistake.
Moving it over to pci-bridge.Cc Andreas Färber <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>Quoted 12 lines
--- hw/pci-bridge/Makefile.objs | 2 + hw/pci-bridge/dec.c | 156 ++++++++++++++++++++++++++++++++++++++++++++ hw/pci-bridge/dec.h | 10 +++ hw/pci-host/Makefile.objs | 1 - hw/pci-host/dec.c | 156 -------------------------------------------- hw/pci-host/dec.h | 10 --- 6 files changed, 168 insertions(+), 167 deletions(-) create mode 100644 hw/pci-bridge/dec.c create mode 100644 hw/pci-bridge/dec.h delete mode 100644 hw/pci-host/dec.c delete mode 100644 hw/pci-host/dec.hUnfortunately you seem to have rename detection disabled - if this is just a move of the file with includes adjusted then
Quoted 7 lines
Acked-by Andreas Färber <[email protected]>Otherwise please supply a "readable" diff or point to a Git branch where we can check.
Thanks,
Andreas
True. It will be readable in the pull request.
Quoted 3 lines
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
PATCH 2/2 firmware_abi: move to include/hw/nvram/
In reply to Michael S. Tsirkinfirmware_abi.h with structs for OpenBIOS landed in hw/sparc/ by mistake
- move it to hw/nvram/ alongside fw_cfg.h. In addition to sparc it's included from ppc mac_nvram.c and will need to include it from prep.c in the future.
--- hw/sparc/sun4m.c | 2 +- hw/sparc64/sun4u.c | 2 +- include/hw/nvram/openbios_firmware_abi.h | 73 ++++++++++++++++++++++++++++++++ include/hw/sparc/firmware_abi.h | 73 -------------------------------- 4 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 include/hw/nvram/openbios_firmware_abi.h delete mode 100644 include/hw/sparc/firmware_abi.h
hw/sparc/sun4m.c +1 -1
@@ -30,7 +30,7 @@#include "sysemu/sysemu.h" #include "net/net.h" #include "hw/boards.h" -#include "hw/sparc/firmware_abi.h" +#include "hw/nvram/openbios_firmware_abi.h" #include "hw/scsi/esp.h" #include "hw/i386/pc.h" #include "hw/isa/isa.h"
hw/sparc64/sun4u.c +1 -1
@@ -32,7 +32,7 @@#include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/boards.h" -#include "hw/sparc/firmware_abi.h" +#include "hw/nvram/openbios_firmware_abi.h" #include "hw/nvram/fw_cfg.h" #include "hw/sysbus.h" #include "hw/ide.h"
include/hw/nvram/openbios_firmware_abi.h new file +73 -0
73 lines not on this page · raw message
include/hw/sparc/firmware_abi.h deleted +0 -73
73 lines not on this page · raw message
Signature · 1 line
MST
Re: [Qemu-devel] [PATCH 2/2] firmware_abi: move to include/hw/nvram/
Am 30.05.2013 11:30, schrieb Michael S. Tsirkin:
Quoted 7 lines
firmware_abi.hwith structs for OpenBIOS landed in hw/sparc/ by mistake
- move it to hw/nvram/ alongsidefw_cfg.h. In addition to sparc it's included from ppcmac_nvram.cand will need to include it fromprep.cin the future.Cc Andreas Färber <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>
Quoted 8 lines
--- hw/sparc/sun4m.c | 2 +- hw/sparc64/sun4u.c | 2 +- include/hw/nvram/openbios_firmware_abi.h | 73 ++++++++++++++++++++++++++++++++ include/hw/sparc/firmware_abi.h | 73 -------------------------------- 4 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 include/hw/nvram/openbios_firmware_abi.h delete mode 100644 include/hw/sparc/firmware_abi.h
Thanks for picking my suggestion up! Same applies as for other patch: In general
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Il 30/05/2013 11:30, Michael S. Tsirkin ha scritto:
Quoted 16 lines
Here are some patches fixing up minor issues
in the tree reorganization.Michael S. Tsirkin (2):
dec.c- move to pci-bridge
firmware_abi: move toinclude/hw/nvram/hw/pci-bridge/Makefile.objs | 2 + hw/pci-bridge/dec.c | 156 +++++++++++++++++++++++++++++++ hw/pci-bridge/dec.h | 10 ++ hw/pci-host/Makefile.objs | 1 - hw/pci-host/dec.c | 156 ------------------------------- hw/pci-host/dec.h | 10 -- hw/sparc/sun4m.c | 2 +- hw/sparc64/sun4u.c | 2 +- include/hw/nvram/openbios_firmware_abi.h | 73 +++++++++++++++
Quoted 9 lines
include/hw/sparc/firmware_abi.h | 73 --------------- 10 files changed, 243 insertions(+), 242 deletions(-) create mode 100644 hw/pci-bridge/dec.c create mode 100644 hw/pci-bridge/dec.h delete mode 100644 hw/pci-host/dec.c delete mode 100644 hw/pci-host/dec.h create mode 100644 include/hw/nvram/openbios_firmware_abi.h delete mode 100644 include/hw/sparc/firmware_abi.h
Thanks. Please give Blue a couple of days to comment.
Paolo
Quoted 27 lines · Paolo Bonzini
Il 30/05/2013 11:30, Michael S. Tsirkin ha scritto:
Quoted 16 lines
Here are some patches fixing up minor issues
in the tree reorganization.Michael S. Tsirkin (2):
dec.c- move to pci-bridge
firmware_abi: move toinclude/hw/nvram/hw/pci-bridge/Makefile.objs | 2 + hw/pci-bridge/dec.c | 156 +++++++++++++++++++++++++++++++ hw/pci-bridge/dec.h | 10 ++ hw/pci-host/Makefile.objs | 1 - hw/pci-host/dec.c | 156 ------------------------------- hw/pci-host/dec.h | 10 -- hw/sparc/sun4m.c | 2 +- hw/sparc64/sun4u.c | 2 +- include/hw/nvram/openbios_firmware_abi.h | 73 +++++++++++++++Quoted 9 lines
include/hw/sparc/firmware_abi.h | 73 --------------- 10 files changed, 243 insertions(+), 242 deletions(-) create mode 100644 hw/pci-bridge/dec.c create mode 100644 hw/pci-bridge/dec.h delete mode 100644 hw/pci-host/dec.c delete mode 100644 hw/pci-host/dec.h create mode 100644 include/hw/nvram/openbios_firmware_abi.h delete mode 100644 include/hw/sparc/firmware_abi.h
Quoted 3 lines
Thanks. Please give Blue a couple of days to comment.
Paolo
I always do this: pci tree tip is documented as
being rebased so I drop stuff from there
if there are nacks.