gmane.comp.emulators.qemu.scm

[COMMIT 930f3fe] Add some chipset doc links

Anthony Liguori — 2009-10-13T18:58:43

From: Blue Swirl <blauwirbel-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>

Signed-off-by: Blue Swirl <blauwirbel-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>

diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index 72f15af..43be7ce 100644
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
< at >< at > -39,6 +39,15 < at >< at > do { printf("APB: " fmt , ## __VA_ARGS__); } while (0)
 #define APB_DPRINTF(fmt, ...)
 #endif
 
+/*
+ * Chipset docs:
+ * PBM: "UltraSPARC IIi User's Manual",
+ * http://www.sun.com/processors/manuals/805-0087.pdf
+ *
+ * APB: "Advanced PCI Bridge (APB) User's Manual",
+ * http://www.sun.com/processors/manuals/805-1251.pdf
+ */
+
 typedef target_phys_addr_t pci_addr_t;
 #include "pci_host.h"
 
diff --git a/hw/m48t59.c b/hw/m48t59.c
index 0f45071..d5a91aa 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
< at >< at > -41,6 +41,14 < at >< at >
  * alarm and a watchdog timer and related control registers. In the
  * PPC platform there is also a nvram lock function.
  */
+
+/*
+ * Chipset docs:
+ * http://www.st.com/stonline/products/literature/ds/2410/m48t02.pdf
+

[COMMIT 3723cd0] sparc64: fix done instruction pc

Anthony Liguori — 2009-10-13T17:03:20

From: Igor V. Kovalenko <igor.v.kovalenko-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>

Fix done instruction to resume with pc=tnpc, npc=tnpc+4

Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>
Signed-off-by: Blue Swirl <blauwirbel-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>

diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c
index 8992d1c..a1ada8b 100644
--- a/target-sparc/op_helper.c
+++ b/target-sparc/op_helper.c
< at >< at > -3318,7 +3318,7 < at >< at > void helper_done(void)
 {
     trap_state* tsptr = cpu_tsptr(env);
 
-    env->pc = tsptr->tpc;
+    env->pc = tsptr->tnpc;
     env->npc = tsptr->tnpc + 4;
     PUT_CCR(env, tsptr->tstate >> 32);
     env->asi = (tsptr->tstate >> 24) & 0xff;

[COMMIT 6a8a280] user: fix libuser build messages

Anthony Liguori — 2009-10-13T17:03:22

From: Blue Swirl <blauwirbel-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>

Signed-off-by: Blue Swirl <blauwirbel-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org>

diff --git a/Makefile b/Makefile
index 7d4d75c..04e21bb 100644
--- a/Makefile
+++ b/Makefile
< at >< at > -59,7 +59,7 < at >< at > $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
 $(filter %-user,$(SUBDIR_RULES)): libuser.a
 
 libuser.a:
-$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libuser V="$(V)" TARGET_DIR="$*/" all,)
+$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libuser V="$(V)" TARGET_DIR="libuser/" all,)
 
 ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))
 romsubdir-%:

[COMMIT 1a4ea1e] qemu: allow pulseaudio to be thedefault

Anthony Liguori — 2009-10-13T14:17:46

From: Michael S. Tsirkin <mst-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

We're seeing various issues with the SDL audio backend and want to
switch to the pulseaudio backend. See e.g.

  https://bugzilla.redhat.com/495964
  https://bugzilla.redhat.com/519540
  https://bugzilla.redhat.com/496627

The pulseaudio backend seems to work well, so we should allow it to be
selected as the default.

Signed-off-by: Mark McLoughlin <markmc-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Michael S. Tsirkin <mst-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: malc <av1474-3kx9bbwexCU< at >public.gmane.org>

diff --git a/audio/paaudio.c b/audio/paaudio.c
index 18292eb..9118ece 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
< at >< at > -519,7 +519,7 < at >< at > struct audio_driver pa_audio_driver = {
     .init           = qpa_audio_init,
     .fini           = qpa_audio_fini,
     .pcm_ops        = &qpa_pcm_ops,
-    .can_be_default = 0,
+    .can_be_default = 1,
     .max_voices_out = INT_MAX,
     .max_voices_in  = INT_MAX,

[COMMIT d549db5] unlock iothread mutex beforerunning kvm ioctl

Anthony Liguori — 2009-10-12T15:19:30

From: Glauber Costa <glommer-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Without this, kvm will hold the mutex while it issues its run ioctl,
and never be able to step out of it, causing a deadlock.

Patchworks-ID: 35359
Signed-off-by: Glauber Costa <glommer-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/kvm-all.c b/kvm-all.c
index 5ea0dd8..48ae26c 100644
--- a/kvm-all.c
+++ b/kvm-all.c
< at >< at > -605,7 +605,9 < at >< at > int kvm_cpu_exec(CPUState *env)
         }
 
         kvm_arch_pre_run(env, run);
+        qemu_mutex_unlock_iothread();
         ret = kvm_vcpu_ioctl(env, KVM_RUN, 0);
+        qemu_mutex_lock_iothread();
         kvm_arch_post_run(env, run);
 
         if (ret == -EINTR || ret == -EAGAIN) {
diff --git a/qemu-common.h b/qemu-common.h
index 12e7dd0..820dd37 100644
--- a/qemu-common.h
+++ b/qemu-common.h
< at >< at > -146,6 +146,9 < at >< at > char *qemu_strndup(const char *str, size_t size);
 void *get_mmap_addr(unsigned long size);
 
 
+v

[COMMIT 3c178e7] rom loader: fix sparc -kernel boot.

Anthony Liguori — 2009-10-12T15:19:30

From: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Changes:
(1) register pstrcpy_targphys() in rom list, it is used for kernel
command lines by a number of architectures.
(2) add rom_ptr() function to get a pointer for applying changes
to loaded images.  Needed for example to tell the linux kernel
where it finds the initrd image by updating the header.
(3) make sparc use rom_ptr for initrd setup.

booting sparc-test works now, and 'info roms' shows this:

(qemu) info roms
addr=0000000000000000 size=0x2a3828 mem=ram name="phdr #0: vmlinux-2.6.11+tcx"
addr=00000000007ff000 size=0x00000e mem=ram name="cmdline"
addr=0000000000800000 size=0x400000 mem=ram name="/root/qemu-test/sparc-test/linux.img"
addr=0000000070000000 size=0x0e4000 mem=rom name="phdr #0: /home/kraxel/projects/qemu/build-zfull/pc-bios/openbios-sparc32"

reboot via 'system_reset' works too.

Patchworks-ID: 35262
Signed-off-by: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguor

[COMMIT 0cde1b4] ide: cmd646 ->unit has just thevalue that we want

Anthony Liguori — 2009-10-12T15:19:29

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Patchworks-ID: 35307
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index eb5a2e9..3b5362d 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
< at >< at > -94,7 +94,7 < at >< at > static uint32_t bmdma_readb(void *opaque, uint32_t addr)
         val = bm->status;
         break;
     case 3:
-        if (bm == &pci_dev->bmdma[0]) {
+        if (bm->unit == 0) {
             val = pci_dev->dev.config[UDIDETCR0];
         } else {
             val = pci_dev->dev.config[UDIDETCR1];
< at >< at > -127,7 +127,7 < at >< at > static void bmdma_writeb(void *opaque, uint32_t addr, uint32_t val)
         bm->status = (val & 0x60) | (bm->status & 1) | (bm->status & ~val & 0x06);
         break;
     case 3:
-        if (bm == &pci_dev->bmdma[0])
+        if (bm->unit == 0)
             pci_dev->dev.config[UDIDETCR0] = val;

[COMMIT 2ca2078] Fixed wacom emulation

Anthony Liguori — 2009-10-12T15:19:31

From: FranÃ§ois Revol <revol-GANU6spQydw< at >public.gmane.org>

- for absolute mode, scale coordinates to the real device maximum values,
since some drivers (on Haiku and Linux at least) need them as such,
and the HID descriptor is boggus on some models anyway,
- keep the coordinates even when no button is pressed, on real tablet
the pen is sensed on the surface even without direct contact,
and drivers expect this,
- map left button to pressure according to what the Haiku driver wants,
- map the right button to the pen button,
- map the middle button to the eraser,
- use asynchronous reporting as the hid code does, stops the Haiku driver
(and probably others) from spending 50% cpu polling for changes.

Signed-off-by: FranÃ§ois Revol <revol-GANU6spQydw< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/usb-wacom.c b/hw/usb-wacom.c
index 3ea7241..fa97db2 100644
--- a/hw/usb-wacom.c
+++ b/hw/usb-wacom.c
< at >< at > -50,6 +50,8 < at >< at > typedef struct USBWacomSt

[COMMIT b96bf49] rom loader: also try filename as-is.

Anthony Liguori — 2009-10-12T15:19:31

From: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

In case qemu_find_file fails try to open the file as-is.

Patchworks-ID: 35263
Signed-off-by: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/loader.c b/hw/loader.c
index f38b994..7aa1a67 100644
--- a/hw/loader.c
+++ b/hw/loader.c
< at >< at > -559,8 +559,7 < at >< at > int rom_add_file(const char *file,
     rom->name = qemu_strdup(file);
     rom->path = qemu_find_file(QEMU_FILE_TYPE_BIOS, rom->name);
     if (rom->path == NULL) {
-        fprintf(stderr, "Could not find option rom '%s'\n", rom->name);
-        goto err;
+        rom->path = strdup(file);
     }
 
     fd = open(rom->path, O_RDONLY | O_BINARY);

[COMMIT 7e07831] ide: 'secondary' field is only usedby cmd646

Anthony Liguori — 2009-10-12T15:19:27

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Patchworks-ID: 35303
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/pci.h b/hw/ide/pci.h
index 690d057..9377503 100644
--- a/hw/ide/pci.h
+++ b/hw/ide/pci.h
< at >< at > -7,7 +7,7 < at >< at > typedef struct PCIIDEState {
     PCIDevice dev;
     IDEBus bus[2];
     BMDMAState bmdma[2];
-    uint32_t secondary;
+    uint32_t secondary; /* used only for cmd646 */
 } PCIIDEState;
 
 void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val);

[COMMIT 61f58e5] ide: cmd646 we can get the pcidevice withcontainer_of

Anthony Liguori — 2009-10-12T15:19:28

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Patchworks-ID: 35305
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 2107209..eb5a2e9 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
< at >< at > -68,10 +68,19 < at >< at > static void ide_map(PCIDevice *pci_dev, int region_num,
     }
 }
 
+static PCIIDEState *pci_from_bm(BMDMAState *bm)
+{
+    if (bm->unit == 0) {
+        return container_of(bm, PCIIDEState, bmdma[0]);
+    } else {
+        return container_of(bm, PCIIDEState, bmdma[1]);
+    }
+}
+
 static uint32_t bmdma_readb(void *opaque, uint32_t addr)
 {
     BMDMAState *bm = opaque;
-    PCIIDEState *pci_dev;
+    PCIIDEState *pci_dev = pci_from_bm(bm);
     uint32_t val;
 
     switch(addr & 3) {
< at >< at > -79,14 +88,12 < at >< at > static uint32_t bmdma_readb(void *opaque, uint32_t addr)
         val = bm->cmd;
         break;
     case 1:
-

[COMMIT a3a766e] slirp: fix !CONFIG_SLIRP compilation

Anthony Liguori — 2009-10-12T15:19:30

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

This moves the code that depens on slirp under CONFIG_SLIRP again.

Patchworks-ID: 35372
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/net.c b/net.c
index 2e4dd58..e93017d 100644
--- a/net.c
+++ b/net.c
< at >< at > -2451,6 +2451,7 < at >< at > static int net_init_nic(QemuOpts *opts, Monitor *mon)
     return idx;
 }
 
+#if defined(CONFIG_SLIRP)
 static int net_init_slirp_configs(const char *name, const char *value, void *opaque)
 {
     struct slirp_config_str *config;
< at >< at > -2546,6 +2547,7 < at >< at > static int net_init_slirp(QemuOpts *opts, Monitor *mon)
 
     return ret;
 }
+#endif /* CONFIG_SLIRP */
 
 #ifdef _WIN32
 static int net_init_tap_win32(QemuOpts *opts, Monitor *mon)
< at >< at > -3227,6 +3229,7 < at >< at > int net_init_clients(void)
 
 int net_client_parse(const char *optarg)
 {
+#if defined(CONFIG_SLIRP)
     /* handle legacy -net channel,por

[COMMIT d1570ba] ide: BMDMAState don't need apci_dev field anymore

Anthony Liguori — 2009-10-12T15:19:29

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Patchworks-ID: 35306
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 3b5362d..5c8f615 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
< at >< at > -144,7 +144,6 < at >< at > static void bmdma_map(PCIDevice *pci_dev, int region_num,
     for(i = 0;i < 2; i++) {
         BMDMAState *bm = &d->bmdma[i];
         d->bus[i].bmdma = bm;
-        bm->pci_dev = DO_UPCAST(PCIIDEState, dev, pci_dev);
         bm->bus = d->bus+i;
         qemu_add_vm_change_state_handler(ide_dma_restart_cb, bm);
 
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 21319fe..2e40431 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
< at >< at > -473,7 +473,6 < at >< at > struct BMDMAState {
     uint8_t status;
     uint32_t addr;
 
-    struct PCIIDEState *pci_dev;
     IDEBus *bus;
     /* current transfer state */
     uint32

[COMMIT 58c0e73] ide: PCIIDEState type field is notneeded anymore

Anthony Liguori — 2009-10-12T15:19:26

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

We have split the functions that needed it for cmd646

Patchworks-ID: 35302
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 8c8daa1..2107209 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
< at >< at > -80,24 +80,17 < at >< at > static uint32_t bmdma_readb(void *opaque, uint32_t addr)
         break;
     case 1:
         pci_dev = bm->pci_dev;
-        if (pci_dev->type == IDE_TYPE_CMD646) {
-            val = pci_dev->dev.config[MRDMODE];
-        } else {
-            val = 0xff;
-        }
+        val = pci_dev->dev.config[MRDMODE];
         break;
     case 2:
         val = bm->status;
         break;
     case 3:
         pci_dev = bm->pci_dev;
-        if (pci_dev->type == IDE_TYPE_CMD646) {
-            if (bm == &pci_dev->bmdma[0])
-                val = pci_dev->dev.config[UDID

[COMMIT 4c3df0e] ide: split cmd646 and piix frompci.c

Anthony Liguori — 2009-10-12T15:19:26

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

This patch splits cmd646 specific code from pci.c.
This patch splits piix4 specific code from pci.c.
And compile new piix.o and cmd646.o when they are needed.
The only change that is not code movemet is removal of cmd646 specific parts
in bmdma_readb/writeb for piix.

Patchworks-ID: 35301
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/Makefile.target b/Makefile.target
index 94bc03b..8d146c5 100644
--- a/Makefile.target
+++ b/Makefile.target
< at >< at > -188,7 +188,7 < at >< at > obj-y += rtl8139.o
 obj-y += e1000.o
 
 # Hardware support
-obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o
+obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
 obj-i386-y += pckbd.o $(sound-obj-y) dma.o
 obj-i386-y += vga.o vga-pci.o vga-isa.o
 obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
< at >< at > -199,6 +199,7

[COMMIT ce88f89] TARGET_I386 is always defined ifTARGET_X86_64 isdefined

Anthony Liguori — 2009-10-12T15:19:30

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Patchworks-ID: 35378
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/hpet_emul.h b/hw/hpet_emul.h
index 3258d8b..cfd95b4 100644
--- a/hw/hpet_emul.h
+++ b/hw/hpet_emul.h
< at >< at > -74,7 +74,7 < at >< at > typedef struct HPETState {
     uint64_t hpet_counter;      /* main counter */
 } HPETState;
 
-#if defined TARGET_I386 || defined TARGET_X86_64
+#if defined TARGET_I386
 extern uint32_t hpet_in_legacy_mode(void);
 extern void hpet_init(qemu_irq *irq);
 #endif
diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index d82131a..e6e6cbf 100644
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
< at >< at > -91,7 +91,7 < at >< at > static void rtc_irq_raise(qemu_irq irq) {
      * mode is established while interrupt is raised. We want it to
      * be lowered in any case
      */
-#if defined TARGET_I386 || defined TARGET_X86_64
+#if defined TARGET_I386

[COMMIT edcca5a] ide: Remove duplicated definitions

Anthony Liguori — 2009-10-12T15:19:23

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Patchworks-ID: 35297
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 029bf80..21319fe 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
< at >< at > -20,12 +20,6 < at >< at > typedef struct IDEDeviceInfo IDEDeviceInfo;
 typedef struct IDEState IDEState;
 typedef struct BMDMAState BMDMAState;
 
-/* debug IDE devices */
-//#define DEBUG_IDE
-//#define DEBUG_IDE_ATAPI
-//#define DEBUG_AIO
-#define USE_DMA_CDROM
-
 /* Bits of HD_STATUS */
 #define ERR_STAT0x01
 #define INDEX_STAT0x02

[COMMIT 18c0fb3] ide: remove uselsess casts fromvoid *

Anthony Liguori — 2009-10-12T15:19:25

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Patchworks-ID: 35298
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 887cde3..aeb77a0 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
< at >< at > -94,7 +94,7 < at >< at > static inline void md_interrupt_update(MicroDriveState *s)
 
 static void md_set_irq(void *opaque, int irq, int level)
 {
-    MicroDriveState *s = (MicroDriveState *) opaque;
+    MicroDriveState *s = opaque;
     if (level)
         s->stat |= STAT_INT;
     else
< at >< at > -115,7 +115,7 < at >< at > static void md_reset(MicroDriveState *s)
 
 static uint8_t md_attr_read(void *opaque, uint32_t at)
 {
-    MicroDriveState *s = (MicroDriveState *) opaque;
+    MicroDriveState *s = opaque;
     if (at < s->attr_base) {
         if (at < s->card.cis_len)
             return s->card.cis[at];
< at >< at > -148,7 +148,7 < at >< at > static uint8_t

[COMMIT 3e7e155] ide: export needed ide-pcifunctions for split

Anthony Liguori — 2009-10-12T15:19:26

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Patchworks-ID: 35300
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index b803a75..af4d7a4 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
< at >< at > -71,7 +71,7 < at >< at > static void ide_map(PCIDevice *pci_dev, int region_num,
     }
 }
 
-static void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
+void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
 {
     BMDMAState *bm = opaque;
 #ifdef DEBUG_IDE
< at >< at > -165,7 +165,7 < at >< at > static void bmdma_writeb(void *opaque, uint32_t addr, uint32_t val)
     }
 }
 
-static uint32_t bmdma_addr_readb(void *opaque, uint32_t addr)
+uint32_t bmdma_addr_readb(void *opaque, uint32_t addr)
 {
     BMDMAState *bm = opaque;
     uint32_t val;
< at >< at > -176,7 +176,7 < at >< at > static uint32_t bmdma_addr_readb(void *opaque, uint32_t addr)
     return val;
 }
 
-static

[COMMIT 65c0f13] ide: create ide/pci.h for common ide pcidefinitions

Anthony Liguori — 2009-10-12T15:19:26

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Patchworks-ID: 35299
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 8fd6f84..b803a75 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
< at >< at > -31,7 +31,7 < at >< at >
 #include "sysemu.h"
 #include "dma.h"
 
-#include <hw/ide/internal.h>
+#include <hw/ide/pci.h>
 
 /***********************************************************/
 /* PCI IDE definitions */
< at >< at > -45,18 +45,6 < at >< at >
 #define UDIDETCR00x73
 #define UDIDETCR10x7B
 
-#define IDE_TYPE_PIIX3   0
-#define IDE_TYPE_CMD646  1
-#define IDE_TYPE_PIIX4   2
-
-typedef struct PCIIDEState {
-    PCIDevice dev;
-    IDEBus bus[2];
-    BMDMAState bmdma[2];
-    int type; /* see IDE_TYPE_xxx */
-    uint32_t secondary;
-} PCIIDEState;
-
 static void cmd646_update_irq(PCIIDEState *d);
 
 static void ide_map(PCIDevice *pci_dev, int region_num,
diff --git a/

[COMMIT e6a7830] ide: Remove cast in pci_register_bar

Anthony Liguori — 2009-10-12T15:19:20

From: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

We already have a PCIDevice at that point

Patchworks-ID: 35296
Signed-off-by: Juan Quintela <quintela-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA< at >public.gmane.org>

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 81bc6a7..8fd6f84 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
< at >< at > -413,16 +413,11 < at >< at > static int pci_cmd646_ide_initfn(PCIDevice *dev)
         pci_conf[0x51] |= 0x08; /* enable IDE1 */
     }
 
-    pci_register_bar((PCIDevice *)d, 0, 0x8,
-                     PCI_ADDRESS_SPACE_IO, ide_map);
-    pci_register_bar((PCIDevice *)d, 1, 0x4,
-                     PCI_ADDRESS_SPACE_IO, ide_map);
-    pci_register_bar((PCIDevice *)d, 2, 0x8,
-                     PCI_ADDRESS_SPACE_IO, ide_map);
-    pci_register_bar((PCIDevice *)d, 3, 0x4,
-                     PCI_ADDRESS_SPACE_IO, ide_map);
-    pci_register_bar((PCIDevice *)d, 4, 0x10,
-                     PCI_ADDRESS_SPA