From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48169 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJmB5-0006vI-9C for qemu-devel@nongnu.org; Wed, 02 Jun 2010 07:32:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJmAz-0001ey-IL for qemu-devel@nongnu.org; Wed, 02 Jun 2010 07:32:07 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:36638) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJmAz-0001eO-C8 for qemu-devel@nongnu.org; Wed, 02 Jun 2010 07:32:01 -0400 Received: from blackfin.pond.sub.org (pD9E39C24.dip.t-dialin.net [217.227.156.36]) by oxygen.pond.sub.org (Postfix) with ESMTPA id ED67A2DD37F for ; Wed, 2 Jun 2010 13:31:58 +0200 (CEST) From: Markus Armbruster Date: Wed, 2 Jun 2010 13:31:54 +0200 Message-Id: <1275478317-1989-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 0/3] Collect block device code in new blockdev.c List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com Based on Kevin's block branch[*], commit f4e0fa33. Code motion like this is a conflict magnet. Speedy merge would be nice. [*] http://repo.or.cz/w/qemu/kevin.git/shortlog/refs/heads/block Markus Armbruster (3): blockdev: Hide QEMUMachine from drive_init() qdev: Move declaration of qdev_init_bdrv() into qdev.h blockdev: Collect block device code in new blockdev.c Makefile.objs | 2 +- blockdev.c | 591 ++++++++++++++++++++++++++++++++++++++++++++++++++ blockdev.h | 62 ++++++ hw/acpi_piix4.c | 1 + hw/apb_pci.c | 1 + hw/device-hotplug.c | 4 +- hw/fdc.c | 1 - hw/fdc.h | 2 +- hw/ide/core.c | 2 - hw/ide/qdev.c | 1 - hw/lan9118.c | 1 + hw/nand.c | 3 +- hw/omap2.c | 2 + hw/onenand.c | 3 +- hw/parallel.c | 1 + hw/pc.c | 1 + hw/pc_piix.c | 1 + hw/pci-hotplug.c | 2 - hw/pcmcia.h | 2 +- hw/pl181.c | 1 - hw/qdev-properties.c | 1 - hw/qdev.h | 4 +- hw/scsi-bus.c | 1 - hw/scsi-disk.c | 2 +- hw/scsi-generic.c | 1 - hw/serial.c | 1 + hw/ssi-sd.c | 1 - hw/usb-hid.c | 1 + hw/usb-msd.c | 4 +- hw/virtio-blk.c | 2 - hw/virtio-pci.c | 1 - monitor.c | 104 +--------- qemu-char.c | 1 - savevm.c | 2 +- sysemu.h | 50 ----- vl.c | 491 +----------------------------------------- 36 files changed, 681 insertions(+), 670 deletions(-) create mode 100644 blockdev.c create mode 100644 blockdev.h