Patchwork Remove libhw

login
register
mail settings
Submitter Stefan Weil
Date Oct. 5, 2012, 5:39 p.m.
Message ID <1349458773-6526-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/189543/
State Accepted
Headers show

Comments

Stefan Weil - Oct. 5, 2012, 5:39 p.m.
The entries for libhw* are no longer needed in .gitignore.

There is also no longer a difference between common-obj-y and
hw-obj-y, so one of those two macros is sufficient.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

Hi Anthony,

this patch is similar to the one which you have sent,
but it includes some more changes.

Regards

Stefan W.

 .gitignore            |    3 -
 Makefile              |    2 +-
 Makefile.hw           |   22 -----
 Makefile.objs         |    9 +-
 Makefile.target       |    1 -
 configure             |    5 --
 hw/9pfs/Makefile.objs |   14 +--
 hw/Makefile.objs      |  226 ++++++++++++++++++++++++-------------------------
 hw/ide/Makefile.objs  |   20 ++---
 hw/usb/Makefile.objs  |   14 +--
 10 files changed, 141 insertions(+), 175 deletions(-)
 delete mode 100644 Makefile.hw
Anthony Liguori - Oct. 5, 2012, 9:17 p.m.
Stefan Weil <sw@weilnetz.de> writes:

> The entries for libhw* are no longer needed in .gitignore.
>
> There is also no longer a difference between common-obj-y and
> hw-obj-y, so one of those two macros is sufficient.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Applied. Thanks.

Regards,

Anthony Liguori

> ---
>
> Hi Anthony,
>
> this patch is similar to the one which you have sent,
> but it includes some more changes.
>
> Regards
>
> Stefan W.
>
>  .gitignore            |    3 -
>  Makefile              |    2 +-
>  Makefile.hw           |   22 -----
>  Makefile.objs         |    9 +-
>  Makefile.target       |    1 -
>  configure             |    5 --
>  hw/9pfs/Makefile.objs |   14 +--
>  hw/Makefile.objs      |  226 ++++++++++++++++++++++++-------------------------
>  hw/ide/Makefile.objs  |   20 ++---
>  hw/usb/Makefile.objs  |   14 +--
>  10 files changed, 141 insertions(+), 175 deletions(-)
>  delete mode 100644 Makefile.hw
>
> diff --git a/.gitignore b/.gitignore
> index 3ef77d0..bd6ba1c 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -12,9 +12,6 @@ trace-dtrace.dtrace
>  *-linux-user
>  *-bsd-user
>  libdis*
> -libhw
> -libhw32
> -libhw64
>  libuser
>  linux-headers/asm
>  qapi-generated
> diff --git a/Makefile b/Makefile
> index 1cebe3a..a9c22bf 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -214,7 +214,7 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
>  
>  qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y)
>  
> -QEMULIBS=libhw libuser libdis libdis-user
> +QEMULIBS=libuser libdis libdis-user
>  
>  clean:
>  # avoid old build problems by removing potentially incorrect old files
> diff --git a/Makefile.hw b/Makefile.hw
> deleted file mode 100644
> index 86f0bf4..0000000
> --- a/Makefile.hw
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -# Makefile for qemu target independent devices.
> -
> -include ../config-host.mak
> -include ../config-all-devices.mak
> -include $(SRC_PATH)/rules.mak
> -
> -.PHONY: all
> -
> -$(call set-vpath, $(SRC_PATH))
> -
> -QEMU_CFLAGS+=-I..
> -QEMU_CFLAGS += -I$(SRC_PATH)/include
> -
> -include $(SRC_PATH)/Makefile.objs
> -
> -all: $(hw-obj-y)
> -# Dummy command so that make thinks it has done something
> -	@true
> -
> -clean:
> -	rm -f $(addsuffix *.o, $(sort $(dir $(hw-obj-y))))
> -	rm -f $(addsuffix *.d, $(sort $(dir $(hw-obj-y))))
> diff --git a/Makefile.objs b/Makefile.objs
> index b1f3e22..74b3542 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -90,10 +90,13 @@ common-obj-y += hw/
>  common-obj-y += ui/
>  common-obj-y += bt-host.o bt-vhci.o
>  
> +common-obj-y += dma-helpers.o
>  common-obj-y += iov.o acl.o
>  common-obj-$(CONFIG_POSIX) += compatfd.o
>  common-obj-y += notify.o event_notifier.o
>  common-obj-y += qemu-timer.o qemu-timer-common.o
> +common-obj-y += qtest.o
> +common-obj-y += vl.o
>  
>  common-obj-$(CONFIG_SLIRP) += slirp/
>  
> @@ -116,11 +119,6 @@ user-obj-y += $(trace-obj-y)
>  user-obj-y += qom/
>  
>  ######################################################################
> -# libhw
> -
> -hw-obj-y = vl.o dma-helpers.o qtest.o hw/
> -
> -######################################################################
>  # libdis
>  # NOTE: the disassembler code is only needed for debugging
>  
> @@ -240,7 +238,6 @@ vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
>  QEMU_CFLAGS+=$(GLIB_CFLAGS)
>  
>  nested-vars += \
> -	hw-obj-y \
>  	qga-obj-y \
>  	block-obj-y \
>  	qom-obj-y \
> diff --git a/Makefile.target b/Makefile.target
> index 4449444..3822bc5 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -154,7 +154,6 @@ all-obj-y += $(addprefix ../, $(universal-obj-y))
>  ifdef CONFIG_SOFTMMU
>  all-obj-y += $(addprefix ../, $(common-obj-y))
>  all-obj-y += $(addprefix ../libdis/, $(libdis-y))
> -all-obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))
>  all-obj-y += $(addprefix ../, $(trace-obj-y))
>  else
>  all-obj-y += $(addprefix ../libuser/, $(user-obj-y))
> diff --git a/configure b/configure
> index e51a793..c4a7837 100755
> --- a/configure
> +++ b/configure
> @@ -3915,8 +3915,6 @@ fi
>  if test "$target_softmmu" = "yes" ; then
>    echo "CONFIG_SOFTMMU=y" >> $config_target_mak
>    echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
> -  echo "HWDIR=../libhw" >> $config_target_mak
> -  echo "subdir-$target: subdir-libhw" >> $config_host_mak
>    if test "$smartcard_nss" = "yes" ; then
>      echo "subdir-$target: subdir-libcacard" >> $config_host_mak
>    fi
> @@ -4158,9 +4156,6 @@ for rom in seabios vgabios ; do
>      echo "LD=$ld" >> $config_mak
>  done
>  
> -d=libhw
> -symlink "$source_path/Makefile.hw" "$d/Makefile"
> -
>  d=libuser
>  symlink "$source_path/Makefile.user" "$d/Makefile"
>  
> diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs
> index 972df24..1e9b595 100644
> --- a/hw/9pfs/Makefile.objs
> +++ b/hw/9pfs/Makefile.objs
> @@ -1,9 +1,9 @@
> -hw-obj-y  = virtio-9p.o
> -hw-obj-y += virtio-9p-local.o virtio-9p-xattr.o
> -hw-obj-y += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
> -hw-obj-y += virtio-9p-coth.o cofs.o codir.o cofile.o
> -hw-obj-y += coxattr.o virtio-9p-synth.o
> -hw-obj-$(CONFIG_OPEN_BY_HANDLE) +=  virtio-9p-handle.o
> -hw-obj-y += virtio-9p-proxy.o
> +common-obj-y  = virtio-9p.o
> +common-obj-y += virtio-9p-local.o virtio-9p-xattr.o
> +common-obj-y += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
> +common-obj-y += virtio-9p-coth.o cofs.o codir.o cofile.o
> +common-obj-y += coxattr.o virtio-9p-synth.o
> +common-obj-$(CONFIG_OPEN_BY_HANDLE) +=  virtio-9p-handle.o
> +common-obj-y += virtio-9p-proxy.o
>  
>  obj-y += virtio-9p-device.o
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index ecdbe44..b59c749 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -1,140 +1,140 @@
> -hw-obj-y = usb/ ide/
> -hw-obj-y += loader.o
> -hw-obj-$(CONFIG_VIRTIO) += virtio-console.o
> -hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
> -hw-obj-y += fw_cfg.o
> -hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o pci_bridge_dev.o
> -hw-obj-$(CONFIG_PCI) += msix.o msi.o
> -hw-obj-$(CONFIG_PCI) += shpc.o
> -hw-obj-$(CONFIG_PCI) += slotid_cap.o
> -hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
> -hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
> -hw-obj-y += watchdog.o
> -hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
> -hw-obj-$(CONFIG_ECC) += ecc.o
> -hw-obj-$(CONFIG_NAND) += nand.o
> -hw-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o
> -hw-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o
> -
> -hw-obj-$(CONFIG_M48T59) += m48t59.o
> -hw-obj-$(CONFIG_ESCC) += escc.o
> -hw-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
> -
> -hw-obj-$(CONFIG_SERIAL) += serial.o
> -hw-obj-$(CONFIG_PARALLEL) += parallel.o
> -hw-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
> -hw-obj-$(CONFIG_PCSPK) += pcspk.o
> -hw-obj-$(CONFIG_PCKBD) += pckbd.o
> -hw-obj-$(CONFIG_FDC) += fdc.o
> -hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o
> -hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o
> -hw-obj-$(CONFIG_DMA) += dma.o
> -hw-obj-$(CONFIG_I82374) += i82374.o
> -hw-obj-$(CONFIG_HPET) += hpet.o
> -hw-obj-$(CONFIG_APPLESMC) += applesmc.o
> -hw-obj-$(CONFIG_SMARTCARD) += ccid-card-passthru.o
> -hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
> -hw-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
> +common-obj-y = usb/ ide/
> +common-obj-y += loader.o
> +common-obj-$(CONFIG_VIRTIO) += virtio-console.o
> +common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
> +common-obj-y += fw_cfg.o
> +common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o pci_bridge_dev.o
> +common-obj-$(CONFIG_PCI) += msix.o msi.o
> +common-obj-$(CONFIG_PCI) += shpc.o
> +common-obj-$(CONFIG_PCI) += slotid_cap.o
> +common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
> +common-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
> +common-obj-y += watchdog.o
> +common-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
> +common-obj-$(CONFIG_ECC) += ecc.o
> +common-obj-$(CONFIG_NAND) += nand.o
> +common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o
> +common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o
> +
> +common-obj-$(CONFIG_M48T59) += m48t59.o
> +common-obj-$(CONFIG_ESCC) += escc.o
> +common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
> +
> +common-obj-$(CONFIG_SERIAL) += serial.o
> +common-obj-$(CONFIG_PARALLEL) += parallel.o
> +common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
> +common-obj-$(CONFIG_PCSPK) += pcspk.o
> +common-obj-$(CONFIG_PCKBD) += pckbd.o
> +common-obj-$(CONFIG_FDC) += fdc.o
> +common-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o
> +common-obj-$(CONFIG_APM) += pm_smbus.o apm.o
> +common-obj-$(CONFIG_DMA) += dma.o
> +common-obj-$(CONFIG_I82374) += i82374.o
> +common-obj-$(CONFIG_HPET) += hpet.o
> +common-obj-$(CONFIG_APPLESMC) += applesmc.o
> +common-obj-$(CONFIG_SMARTCARD) += ccid-card-passthru.o
> +common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
> +common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
>  
>  # PPC devices
> -hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o
> -hw-obj-$(CONFIG_I82378) += i82378.o
> +common-obj-$(CONFIG_PREP_PCI) += prep_pci.o
> +common-obj-$(CONFIG_I82378) += i82378.o
>  # Mac shared devices
> -hw-obj-$(CONFIG_MACIO) += macio.o
> -hw-obj-$(CONFIG_CUDA) += cuda.o
> -hw-obj-$(CONFIG_ADB) += adb.o
> -hw-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
> -hw-obj-$(CONFIG_MAC_DBDMA) += mac_dbdma.o
> +common-obj-$(CONFIG_MACIO) += macio.o
> +common-obj-$(CONFIG_CUDA) += cuda.o
> +common-obj-$(CONFIG_ADB) += adb.o
> +common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
> +common-obj-$(CONFIG_MAC_DBDMA) += mac_dbdma.o
>  # OldWorld PowerMac
> -hw-obj-$(CONFIG_HEATHROW_PIC) += heathrow_pic.o
> -hw-obj-$(CONFIG_GRACKLE_PCI) += grackle_pci.o
> +common-obj-$(CONFIG_HEATHROW_PIC) += heathrow_pic.o
> +common-obj-$(CONFIG_GRACKLE_PCI) += grackle_pci.o
>  # NewWorld PowerMac
> -hw-obj-$(CONFIG_UNIN_PCI) += unin_pci.o
> -hw-obj-$(CONFIG_DEC_PCI) += dec_pci.o
> +common-obj-$(CONFIG_UNIN_PCI) += unin_pci.o
> +common-obj-$(CONFIG_DEC_PCI) += dec_pci.o
>  # PowerPC E500 boards
> -hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o
> +common-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o
>  
>  # MIPS devices
> -hw-obj-$(CONFIG_PIIX4) += piix4.o
> -hw-obj-$(CONFIG_G364FB) += g364fb.o
> -hw-obj-$(CONFIG_JAZZ_LED) += jazz_led.o
> +common-obj-$(CONFIG_PIIX4) += piix4.o
> +common-obj-$(CONFIG_G364FB) += g364fb.o
> +common-obj-$(CONFIG_JAZZ_LED) += jazz_led.o
>  
>  # Xilinx devices
> -hw-obj-$(CONFIG_XILINX) += xilinx_intc.o
> -hw-obj-$(CONFIG_XILINX) += xilinx_timer.o
> -hw-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
> -hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
> -hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o
> -hw-obj-$(CONFIG_XILINX_AXI) += stream.o
> +common-obj-$(CONFIG_XILINX) += xilinx_intc.o
> +common-obj-$(CONFIG_XILINX) += xilinx_timer.o
> +common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
> +common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
> +common-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o
> +common-obj-$(CONFIG_XILINX_AXI) += stream.o
>  
>  # PKUnity SoC devices
> -hw-obj-$(CONFIG_PUV3) += puv3_intc.o
> -hw-obj-$(CONFIG_PUV3) += puv3_ost.o
> -hw-obj-$(CONFIG_PUV3) += puv3_gpio.o
> -hw-obj-$(CONFIG_PUV3) += puv3_pm.o
> -hw-obj-$(CONFIG_PUV3) += puv3_dma.o
> +common-obj-$(CONFIG_PUV3) += puv3_intc.o
> +common-obj-$(CONFIG_PUV3) += puv3_ost.o
> +common-obj-$(CONFIG_PUV3) += puv3_gpio.o
> +common-obj-$(CONFIG_PUV3) += puv3_pm.o
> +common-obj-$(CONFIG_PUV3) += puv3_dma.o
>  
>  # ARM devices
> -hw-obj-$(CONFIG_ARM_TIMER) += arm_timer.o
> -hw-obj-$(CONFIG_PL011) += pl011.o
> -hw-obj-$(CONFIG_PL022) += pl022.o
> -hw-obj-$(CONFIG_PL031) += pl031.o
> -hw-obj-$(CONFIG_PL041) += pl041.o lm4549.o
> -hw-obj-$(CONFIG_PL050) += pl050.o
> -hw-obj-$(CONFIG_PL061) += pl061.o
> -hw-obj-$(CONFIG_PL080) += pl080.o
> -hw-obj-$(CONFIG_PL110) += pl110.o
> -hw-obj-$(CONFIG_PL181) += pl181.o
> -hw-obj-$(CONFIG_PL190) += pl190.o
> -hw-obj-$(CONFIG_PL310) += arm_l2x0.o
> -hw-obj-$(CONFIG_VERSATILE_PCI) += versatile_pci.o
> -hw-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
> -hw-obj-$(CONFIG_CADENCE) += cadence_uart.o
> -hw-obj-$(CONFIG_CADENCE) += cadence_ttc.o
> -hw-obj-$(CONFIG_CADENCE) += cadence_gem.o
> -hw-obj-$(CONFIG_XGMAC) += xgmac.o
> +common-obj-$(CONFIG_ARM_TIMER) += arm_timer.o
> +common-obj-$(CONFIG_PL011) += pl011.o
> +common-obj-$(CONFIG_PL022) += pl022.o
> +common-obj-$(CONFIG_PL031) += pl031.o
> +common-obj-$(CONFIG_PL041) += pl041.o lm4549.o
> +common-obj-$(CONFIG_PL050) += pl050.o
> +common-obj-$(CONFIG_PL061) += pl061.o
> +common-obj-$(CONFIG_PL080) += pl080.o
> +common-obj-$(CONFIG_PL110) += pl110.o
> +common-obj-$(CONFIG_PL181) += pl181.o
> +common-obj-$(CONFIG_PL190) += pl190.o
> +common-obj-$(CONFIG_PL310) += arm_l2x0.o
> +common-obj-$(CONFIG_VERSATILE_PCI) += versatile_pci.o
> +common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
> +common-obj-$(CONFIG_CADENCE) += cadence_uart.o
> +common-obj-$(CONFIG_CADENCE) += cadence_ttc.o
> +common-obj-$(CONFIG_CADENCE) += cadence_gem.o
> +common-obj-$(CONFIG_XGMAC) += xgmac.o
>  
>  # PCI watchdog devices
> -hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
> +common-obj-$(CONFIG_PCI) += wdt_i6300esb.o
>  
> -hw-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
> +common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
>  
>  # PCI network cards
> -hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o
> -hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
> -hw-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o
> -hw-obj-$(CONFIG_PCNET_COMMON) += pcnet.o
> -hw-obj-$(CONFIG_E1000_PCI) += e1000.o
> -hw-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o
> -
> -hw-obj-$(CONFIG_SMC91C111) += smc91c111.o
> -hw-obj-$(CONFIG_LAN9118) += lan9118.o
> -hw-obj-$(CONFIG_NE2000_ISA) += ne2000-isa.o
> -hw-obj-$(CONFIG_OPENCORES_ETH) += opencores_eth.o
> +common-obj-$(CONFIG_NE2000_PCI) += ne2000.o
> +common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
> +common-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o
> +common-obj-$(CONFIG_PCNET_COMMON) += pcnet.o
> +common-obj-$(CONFIG_E1000_PCI) += e1000.o
> +common-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o
> +
> +common-obj-$(CONFIG_SMC91C111) += smc91c111.o
> +common-obj-$(CONFIG_LAN9118) += lan9118.o
> +common-obj-$(CONFIG_NE2000_ISA) += ne2000-isa.o
> +common-obj-$(CONFIG_OPENCORES_ETH) += opencores_eth.o
>  
>  # SCSI layer
> -hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o
> -hw-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o
> -hw-obj-$(CONFIG_ESP) += esp.o
> -hw-obj-$(CONFIG_ESP_PCI) += esp-pci.o
> +common-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o
> +common-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o
> +common-obj-$(CONFIG_ESP) += esp.o
> +common-obj-$(CONFIG_ESP_PCI) += esp-pci.o
>  
> -hw-obj-y += sysbus.o isa-bus.o
> -hw-obj-y += qdev-addr.o
> +common-obj-y += sysbus.o isa-bus.o
> +common-obj-y += qdev-addr.o
>  
>  # VGA
> -hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o
> -hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o
> -hw-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o
> -hw-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o
> -hw-obj-$(CONFIG_VMMOUSE) += vmmouse.o
> -hw-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
> +common-obj-$(CONFIG_VGA_PCI) += vga-pci.o
> +common-obj-$(CONFIG_VGA_ISA) += vga-isa.o
> +common-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o
> +common-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o
> +common-obj-$(CONFIG_VMMOUSE) += vmmouse.o
> +common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
>  
> -hw-obj-$(CONFIG_RC4030) += rc4030.o
> -hw-obj-$(CONFIG_DP8393X) += dp8393x.o
> -hw-obj-$(CONFIG_DS1225Y) += ds1225y.o
> -hw-obj-$(CONFIG_MIPSNET) += mipsnet.o
> +common-obj-$(CONFIG_RC4030) += rc4030.o
> +common-obj-$(CONFIG_DP8393X) += dp8393x.o
> +common-obj-$(CONFIG_DS1225Y) += ds1225y.o
> +common-obj-$(CONFIG_MIPSNET) += mipsnet.o
>  
> -hw-obj-y += null-machine.o
> +common-obj-y += null-machine.o
>  
>  # Sound
>  sound-obj-y =
> @@ -148,9 +148,9 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o
>  
>  $(obj)/adlib.o $(obj)/fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
>  
> -hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)
> +common-obj-$(CONFIG_SOUND) += $(sound-obj-y)
>  
> -hw-obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
> +common-obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
>  
>  common-obj-y += usb/
>  common-obj-y += irq.o
> diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs
> index cf718dd..5c8c22a 100644
> --- a/hw/ide/Makefile.objs
> +++ b/hw/ide/Makefile.objs
> @@ -1,10 +1,10 @@
> -hw-obj-$(CONFIG_IDE_CORE) += core.o atapi.o
> -hw-obj-$(CONFIG_IDE_QDEV) += qdev.o
> -hw-obj-$(CONFIG_IDE_PCI) += pci.o
> -hw-obj-$(CONFIG_IDE_ISA) += isa.o
> -hw-obj-$(CONFIG_IDE_PIIX) += piix.o
> -hw-obj-$(CONFIG_IDE_CMD646) += cmd646.o
> -hw-obj-$(CONFIG_IDE_MACIO) += macio.o
> -hw-obj-$(CONFIG_IDE_VIA) += via.o
> -hw-obj-$(CONFIG_AHCI) += ahci.o
> -hw-obj-$(CONFIG_AHCI) += ich.o
> +common-obj-$(CONFIG_IDE_CORE) += core.o atapi.o
> +common-obj-$(CONFIG_IDE_QDEV) += qdev.o
> +common-obj-$(CONFIG_IDE_PCI) += pci.o
> +common-obj-$(CONFIG_IDE_ISA) += isa.o
> +common-obj-$(CONFIG_IDE_PIIX) += piix.o
> +common-obj-$(CONFIG_IDE_CMD646) += cmd646.o
> +common-obj-$(CONFIG_IDE_MACIO) += macio.o
> +common-obj-$(CONFIG_IDE_VIA) += via.o
> +common-obj-$(CONFIG_AHCI) += ahci.o
> +common-obj-$(CONFIG_AHCI) += ich.o
> diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
> index 4225136..6425c1f 100644
> --- a/hw/usb/Makefile.objs
> +++ b/hw/usb/Makefile.objs
> @@ -1,11 +1,11 @@
> -hw-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
> -hw-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
> -hw-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o
> -hw-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
> -hw-obj-y += libhw.o
> +common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
> +common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
> +common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o
> +common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
> +common-obj-y += libhw.o
>  
> -hw-obj-$(CONFIG_SMARTCARD) += dev-smartcard-reader.o
> -hw-obj-$(CONFIG_USB_REDIR) += redirect.o
> +common-obj-$(CONFIG_SMARTCARD) += dev-smartcard-reader.o
> +common-obj-$(CONFIG_USB_REDIR) += redirect.o
>  
>  common-obj-y += core.o bus.o desc.o dev-hub.o
>  common-obj-y += host-$(HOST_USB).o dev-bluetooth.o
> -- 
> 1.7.10

Patch

diff --git a/.gitignore b/.gitignore
index 3ef77d0..bd6ba1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,6 @@  trace-dtrace.dtrace
 *-linux-user
 *-bsd-user
 libdis*
-libhw
-libhw32
-libhw64
 libuser
 linux-headers/asm
 qapi-generated
diff --git a/Makefile b/Makefile
index 1cebe3a..a9c22bf 100644
--- a/Makefile
+++ b/Makefile
@@ -214,7 +214,7 @@  $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
 
 qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y)
 
-QEMULIBS=libhw libuser libdis libdis-user
+QEMULIBS=libuser libdis libdis-user
 
 clean:
 # avoid old build problems by removing potentially incorrect old files
diff --git a/Makefile.hw b/Makefile.hw
deleted file mode 100644
index 86f0bf4..0000000
--- a/Makefile.hw
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# Makefile for qemu target independent devices.
-
-include ../config-host.mak
-include ../config-all-devices.mak
-include $(SRC_PATH)/rules.mak
-
-.PHONY: all
-
-$(call set-vpath, $(SRC_PATH))
-
-QEMU_CFLAGS+=-I..
-QEMU_CFLAGS += -I$(SRC_PATH)/include
-
-include $(SRC_PATH)/Makefile.objs
-
-all: $(hw-obj-y)
-# Dummy command so that make thinks it has done something
-	@true
-
-clean:
-	rm -f $(addsuffix *.o, $(sort $(dir $(hw-obj-y))))
-	rm -f $(addsuffix *.d, $(sort $(dir $(hw-obj-y))))
diff --git a/Makefile.objs b/Makefile.objs
index b1f3e22..74b3542 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -90,10 +90,13 @@  common-obj-y += hw/
 common-obj-y += ui/
 common-obj-y += bt-host.o bt-vhci.o
 
+common-obj-y += dma-helpers.o
 common-obj-y += iov.o acl.o
 common-obj-$(CONFIG_POSIX) += compatfd.o
 common-obj-y += notify.o event_notifier.o
 common-obj-y += qemu-timer.o qemu-timer-common.o
+common-obj-y += qtest.o
+common-obj-y += vl.o
 
 common-obj-$(CONFIG_SLIRP) += slirp/
 
@@ -116,11 +119,6 @@  user-obj-y += $(trace-obj-y)
 user-obj-y += qom/
 
 ######################################################################
-# libhw
-
-hw-obj-y = vl.o dma-helpers.o qtest.o hw/
-
-######################################################################
 # libdis
 # NOTE: the disassembler code is only needed for debugging
 
@@ -240,7 +238,6 @@  vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
 QEMU_CFLAGS+=$(GLIB_CFLAGS)
 
 nested-vars += \
-	hw-obj-y \
 	qga-obj-y \
 	block-obj-y \
 	qom-obj-y \
diff --git a/Makefile.target b/Makefile.target
index 4449444..3822bc5 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -154,7 +154,6 @@  all-obj-y += $(addprefix ../, $(universal-obj-y))
 ifdef CONFIG_SOFTMMU
 all-obj-y += $(addprefix ../, $(common-obj-y))
 all-obj-y += $(addprefix ../libdis/, $(libdis-y))
-all-obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))
 all-obj-y += $(addprefix ../, $(trace-obj-y))
 else
 all-obj-y += $(addprefix ../libuser/, $(user-obj-y))
diff --git a/configure b/configure
index e51a793..c4a7837 100755
--- a/configure
+++ b/configure
@@ -3915,8 +3915,6 @@  fi
 if test "$target_softmmu" = "yes" ; then
   echo "CONFIG_SOFTMMU=y" >> $config_target_mak
   echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
-  echo "HWDIR=../libhw" >> $config_target_mak
-  echo "subdir-$target: subdir-libhw" >> $config_host_mak
   if test "$smartcard_nss" = "yes" ; then
     echo "subdir-$target: subdir-libcacard" >> $config_host_mak
   fi
@@ -4158,9 +4156,6 @@  for rom in seabios vgabios ; do
     echo "LD=$ld" >> $config_mak
 done
 
-d=libhw
-symlink "$source_path/Makefile.hw" "$d/Makefile"
-
 d=libuser
 symlink "$source_path/Makefile.user" "$d/Makefile"
 
diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs
index 972df24..1e9b595 100644
--- a/hw/9pfs/Makefile.objs
+++ b/hw/9pfs/Makefile.objs
@@ -1,9 +1,9 @@ 
-hw-obj-y  = virtio-9p.o
-hw-obj-y += virtio-9p-local.o virtio-9p-xattr.o
-hw-obj-y += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
-hw-obj-y += virtio-9p-coth.o cofs.o codir.o cofile.o
-hw-obj-y += coxattr.o virtio-9p-synth.o
-hw-obj-$(CONFIG_OPEN_BY_HANDLE) +=  virtio-9p-handle.o
-hw-obj-y += virtio-9p-proxy.o
+common-obj-y  = virtio-9p.o
+common-obj-y += virtio-9p-local.o virtio-9p-xattr.o
+common-obj-y += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
+common-obj-y += virtio-9p-coth.o cofs.o codir.o cofile.o
+common-obj-y += coxattr.o virtio-9p-synth.o
+common-obj-$(CONFIG_OPEN_BY_HANDLE) +=  virtio-9p-handle.o
+common-obj-y += virtio-9p-proxy.o
 
 obj-y += virtio-9p-device.o
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index ecdbe44..b59c749 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,140 +1,140 @@ 
-hw-obj-y = usb/ ide/
-hw-obj-y += loader.o
-hw-obj-$(CONFIG_VIRTIO) += virtio-console.o
-hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
-hw-obj-y += fw_cfg.o
-hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o pci_bridge_dev.o
-hw-obj-$(CONFIG_PCI) += msix.o msi.o
-hw-obj-$(CONFIG_PCI) += shpc.o
-hw-obj-$(CONFIG_PCI) += slotid_cap.o
-hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
-hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
-hw-obj-y += watchdog.o
-hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
-hw-obj-$(CONFIG_ECC) += ecc.o
-hw-obj-$(CONFIG_NAND) += nand.o
-hw-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o
-hw-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o
-
-hw-obj-$(CONFIG_M48T59) += m48t59.o
-hw-obj-$(CONFIG_ESCC) += escc.o
-hw-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
-
-hw-obj-$(CONFIG_SERIAL) += serial.o
-hw-obj-$(CONFIG_PARALLEL) += parallel.o
-hw-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
-hw-obj-$(CONFIG_PCSPK) += pcspk.o
-hw-obj-$(CONFIG_PCKBD) += pckbd.o
-hw-obj-$(CONFIG_FDC) += fdc.o
-hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o
-hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o
-hw-obj-$(CONFIG_DMA) += dma.o
-hw-obj-$(CONFIG_I82374) += i82374.o
-hw-obj-$(CONFIG_HPET) += hpet.o
-hw-obj-$(CONFIG_APPLESMC) += applesmc.o
-hw-obj-$(CONFIG_SMARTCARD) += ccid-card-passthru.o
-hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
-hw-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
+common-obj-y = usb/ ide/
+common-obj-y += loader.o
+common-obj-$(CONFIG_VIRTIO) += virtio-console.o
+common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
+common-obj-y += fw_cfg.o
+common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o pci_bridge_dev.o
+common-obj-$(CONFIG_PCI) += msix.o msi.o
+common-obj-$(CONFIG_PCI) += shpc.o
+common-obj-$(CONFIG_PCI) += slotid_cap.o
+common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
+common-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
+common-obj-y += watchdog.o
+common-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
+common-obj-$(CONFIG_ECC) += ecc.o
+common-obj-$(CONFIG_NAND) += nand.o
+common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o
+common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o
+
+common-obj-$(CONFIG_M48T59) += m48t59.o
+common-obj-$(CONFIG_ESCC) += escc.o
+common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
+
+common-obj-$(CONFIG_SERIAL) += serial.o
+common-obj-$(CONFIG_PARALLEL) += parallel.o
+common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o
+common-obj-$(CONFIG_PCSPK) += pcspk.o
+common-obj-$(CONFIG_PCKBD) += pckbd.o
+common-obj-$(CONFIG_FDC) += fdc.o
+common-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o
+common-obj-$(CONFIG_APM) += pm_smbus.o apm.o
+common-obj-$(CONFIG_DMA) += dma.o
+common-obj-$(CONFIG_I82374) += i82374.o
+common-obj-$(CONFIG_HPET) += hpet.o
+common-obj-$(CONFIG_APPLESMC) += applesmc.o
+common-obj-$(CONFIG_SMARTCARD) += ccid-card-passthru.o
+common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
+common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
 
 # PPC devices
-hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o
-hw-obj-$(CONFIG_I82378) += i82378.o
+common-obj-$(CONFIG_PREP_PCI) += prep_pci.o
+common-obj-$(CONFIG_I82378) += i82378.o
 # Mac shared devices
-hw-obj-$(CONFIG_MACIO) += macio.o
-hw-obj-$(CONFIG_CUDA) += cuda.o
-hw-obj-$(CONFIG_ADB) += adb.o
-hw-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
-hw-obj-$(CONFIG_MAC_DBDMA) += mac_dbdma.o
+common-obj-$(CONFIG_MACIO) += macio.o
+common-obj-$(CONFIG_CUDA) += cuda.o
+common-obj-$(CONFIG_ADB) += adb.o
+common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
+common-obj-$(CONFIG_MAC_DBDMA) += mac_dbdma.o
 # OldWorld PowerMac
-hw-obj-$(CONFIG_HEATHROW_PIC) += heathrow_pic.o
-hw-obj-$(CONFIG_GRACKLE_PCI) += grackle_pci.o
+common-obj-$(CONFIG_HEATHROW_PIC) += heathrow_pic.o
+common-obj-$(CONFIG_GRACKLE_PCI) += grackle_pci.o
 # NewWorld PowerMac
-hw-obj-$(CONFIG_UNIN_PCI) += unin_pci.o
-hw-obj-$(CONFIG_DEC_PCI) += dec_pci.o
+common-obj-$(CONFIG_UNIN_PCI) += unin_pci.o
+common-obj-$(CONFIG_DEC_PCI) += dec_pci.o
 # PowerPC E500 boards
-hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o
+common-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o
 
 # MIPS devices
-hw-obj-$(CONFIG_PIIX4) += piix4.o
-hw-obj-$(CONFIG_G364FB) += g364fb.o
-hw-obj-$(CONFIG_JAZZ_LED) += jazz_led.o
+common-obj-$(CONFIG_PIIX4) += piix4.o
+common-obj-$(CONFIG_G364FB) += g364fb.o
+common-obj-$(CONFIG_JAZZ_LED) += jazz_led.o
 
 # Xilinx devices
-hw-obj-$(CONFIG_XILINX) += xilinx_intc.o
-hw-obj-$(CONFIG_XILINX) += xilinx_timer.o
-hw-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
-hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
-hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o
-hw-obj-$(CONFIG_XILINX_AXI) += stream.o
+common-obj-$(CONFIG_XILINX) += xilinx_intc.o
+common-obj-$(CONFIG_XILINX) += xilinx_timer.o
+common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
+common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
+common-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o
+common-obj-$(CONFIG_XILINX_AXI) += stream.o
 
 # PKUnity SoC devices
-hw-obj-$(CONFIG_PUV3) += puv3_intc.o
-hw-obj-$(CONFIG_PUV3) += puv3_ost.o
-hw-obj-$(CONFIG_PUV3) += puv3_gpio.o
-hw-obj-$(CONFIG_PUV3) += puv3_pm.o
-hw-obj-$(CONFIG_PUV3) += puv3_dma.o
+common-obj-$(CONFIG_PUV3) += puv3_intc.o
+common-obj-$(CONFIG_PUV3) += puv3_ost.o
+common-obj-$(CONFIG_PUV3) += puv3_gpio.o
+common-obj-$(CONFIG_PUV3) += puv3_pm.o
+common-obj-$(CONFIG_PUV3) += puv3_dma.o
 
 # ARM devices
-hw-obj-$(CONFIG_ARM_TIMER) += arm_timer.o
-hw-obj-$(CONFIG_PL011) += pl011.o
-hw-obj-$(CONFIG_PL022) += pl022.o
-hw-obj-$(CONFIG_PL031) += pl031.o
-hw-obj-$(CONFIG_PL041) += pl041.o lm4549.o
-hw-obj-$(CONFIG_PL050) += pl050.o
-hw-obj-$(CONFIG_PL061) += pl061.o
-hw-obj-$(CONFIG_PL080) += pl080.o
-hw-obj-$(CONFIG_PL110) += pl110.o
-hw-obj-$(CONFIG_PL181) += pl181.o
-hw-obj-$(CONFIG_PL190) += pl190.o
-hw-obj-$(CONFIG_PL310) += arm_l2x0.o
-hw-obj-$(CONFIG_VERSATILE_PCI) += versatile_pci.o
-hw-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
-hw-obj-$(CONFIG_CADENCE) += cadence_uart.o
-hw-obj-$(CONFIG_CADENCE) += cadence_ttc.o
-hw-obj-$(CONFIG_CADENCE) += cadence_gem.o
-hw-obj-$(CONFIG_XGMAC) += xgmac.o
+common-obj-$(CONFIG_ARM_TIMER) += arm_timer.o
+common-obj-$(CONFIG_PL011) += pl011.o
+common-obj-$(CONFIG_PL022) += pl022.o
+common-obj-$(CONFIG_PL031) += pl031.o
+common-obj-$(CONFIG_PL041) += pl041.o lm4549.o
+common-obj-$(CONFIG_PL050) += pl050.o
+common-obj-$(CONFIG_PL061) += pl061.o
+common-obj-$(CONFIG_PL080) += pl080.o
+common-obj-$(CONFIG_PL110) += pl110.o
+common-obj-$(CONFIG_PL181) += pl181.o
+common-obj-$(CONFIG_PL190) += pl190.o
+common-obj-$(CONFIG_PL310) += arm_l2x0.o
+common-obj-$(CONFIG_VERSATILE_PCI) += versatile_pci.o
+common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
+common-obj-$(CONFIG_CADENCE) += cadence_uart.o
+common-obj-$(CONFIG_CADENCE) += cadence_ttc.o
+common-obj-$(CONFIG_CADENCE) += cadence_gem.o
+common-obj-$(CONFIG_XGMAC) += xgmac.o
 
 # PCI watchdog devices
-hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
+common-obj-$(CONFIG_PCI) += wdt_i6300esb.o
 
-hw-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
+common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
 
 # PCI network cards
-hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o
-hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
-hw-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o
-hw-obj-$(CONFIG_PCNET_COMMON) += pcnet.o
-hw-obj-$(CONFIG_E1000_PCI) += e1000.o
-hw-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o
-
-hw-obj-$(CONFIG_SMC91C111) += smc91c111.o
-hw-obj-$(CONFIG_LAN9118) += lan9118.o
-hw-obj-$(CONFIG_NE2000_ISA) += ne2000-isa.o
-hw-obj-$(CONFIG_OPENCORES_ETH) += opencores_eth.o
+common-obj-$(CONFIG_NE2000_PCI) += ne2000.o
+common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
+common-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o
+common-obj-$(CONFIG_PCNET_COMMON) += pcnet.o
+common-obj-$(CONFIG_E1000_PCI) += e1000.o
+common-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o
+
+common-obj-$(CONFIG_SMC91C111) += smc91c111.o
+common-obj-$(CONFIG_LAN9118) += lan9118.o
+common-obj-$(CONFIG_NE2000_ISA) += ne2000-isa.o
+common-obj-$(CONFIG_OPENCORES_ETH) += opencores_eth.o
 
 # SCSI layer
-hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o
-hw-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o
-hw-obj-$(CONFIG_ESP) += esp.o
-hw-obj-$(CONFIG_ESP_PCI) += esp-pci.o
+common-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o
+common-obj-$(CONFIG_MEGASAS_SCSI_PCI) += megasas.o
+common-obj-$(CONFIG_ESP) += esp.o
+common-obj-$(CONFIG_ESP_PCI) += esp-pci.o
 
-hw-obj-y += sysbus.o isa-bus.o
-hw-obj-y += qdev-addr.o
+common-obj-y += sysbus.o isa-bus.o
+common-obj-y += qdev-addr.o
 
 # VGA
-hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o
-hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o
-hw-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o
-hw-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o
-hw-obj-$(CONFIG_VMMOUSE) += vmmouse.o
-hw-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
+common-obj-$(CONFIG_VGA_PCI) += vga-pci.o
+common-obj-$(CONFIG_VGA_ISA) += vga-isa.o
+common-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o
+common-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o
+common-obj-$(CONFIG_VMMOUSE) += vmmouse.o
+common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
 
-hw-obj-$(CONFIG_RC4030) += rc4030.o
-hw-obj-$(CONFIG_DP8393X) += dp8393x.o
-hw-obj-$(CONFIG_DS1225Y) += ds1225y.o
-hw-obj-$(CONFIG_MIPSNET) += mipsnet.o
+common-obj-$(CONFIG_RC4030) += rc4030.o
+common-obj-$(CONFIG_DP8393X) += dp8393x.o
+common-obj-$(CONFIG_DS1225Y) += ds1225y.o
+common-obj-$(CONFIG_MIPSNET) += mipsnet.o
 
-hw-obj-y += null-machine.o
+common-obj-y += null-machine.o
 
 # Sound
 sound-obj-y =
@@ -148,9 +148,9 @@  sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o
 
 $(obj)/adlib.o $(obj)/fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
 
-hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)
+common-obj-$(CONFIG_SOUND) += $(sound-obj-y)
 
-hw-obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
+common-obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
 
 common-obj-y += usb/
 common-obj-y += irq.o
diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs
index cf718dd..5c8c22a 100644
--- a/hw/ide/Makefile.objs
+++ b/hw/ide/Makefile.objs
@@ -1,10 +1,10 @@ 
-hw-obj-$(CONFIG_IDE_CORE) += core.o atapi.o
-hw-obj-$(CONFIG_IDE_QDEV) += qdev.o
-hw-obj-$(CONFIG_IDE_PCI) += pci.o
-hw-obj-$(CONFIG_IDE_ISA) += isa.o
-hw-obj-$(CONFIG_IDE_PIIX) += piix.o
-hw-obj-$(CONFIG_IDE_CMD646) += cmd646.o
-hw-obj-$(CONFIG_IDE_MACIO) += macio.o
-hw-obj-$(CONFIG_IDE_VIA) += via.o
-hw-obj-$(CONFIG_AHCI) += ahci.o
-hw-obj-$(CONFIG_AHCI) += ich.o
+common-obj-$(CONFIG_IDE_CORE) += core.o atapi.o
+common-obj-$(CONFIG_IDE_QDEV) += qdev.o
+common-obj-$(CONFIG_IDE_PCI) += pci.o
+common-obj-$(CONFIG_IDE_ISA) += isa.o
+common-obj-$(CONFIG_IDE_PIIX) += piix.o
+common-obj-$(CONFIG_IDE_CMD646) += cmd646.o
+common-obj-$(CONFIG_IDE_MACIO) += macio.o
+common-obj-$(CONFIG_IDE_VIA) += via.o
+common-obj-$(CONFIG_AHCI) += ahci.o
+common-obj-$(CONFIG_AHCI) += ich.o
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 4225136..6425c1f 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -1,11 +1,11 @@ 
-hw-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
-hw-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
-hw-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o
-hw-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
-hw-obj-y += libhw.o
+common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
+common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
+common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o
+common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
+common-obj-y += libhw.o
 
-hw-obj-$(CONFIG_SMARTCARD) += dev-smartcard-reader.o
-hw-obj-$(CONFIG_USB_REDIR) += redirect.o
+common-obj-$(CONFIG_SMARTCARD) += dev-smartcard-reader.o
+common-obj-$(CONFIG_USB_REDIR) += redirect.o
 
 common-obj-y += core.o bus.o desc.o dev-hub.o
 common-obj-y += host-$(HOST_USB).o dev-bluetooth.o