Commit 0d3e41d5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging 



- some configure updates (HAX/NetBSD, remove "wav", -Waddress-of-packed-member)
- remove deprecated options
- some trace and error cleanup
- typo fixes

# gpg: Signature made Thu 14 Feb 2019 10:46:50 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  configure: improve usbfs check
  hw/sparc64: Explicitly set default_display = "std"
  hw/dma/i8257: Use qemu_log_mask(UNIMP) instead of fprintf
  wavcapture: Convert to error_report
  kvm: Add kvm_set_ioeventfd* traces
  HMP: Prepend errors with 'Error:'
  pckbd: Convert DPRINTF->trace
  configure: Make -Waddress-of-packed-member warnings be errors
  configure: Add HAX support in NetBSD
  configure: fix qemu-img name
  configure: remove handling of "wav" audio driver
  qemu-options: Remove deprecated option -clock
  qemu-deprecated: Remove -virtioconsole and -no-frame for good
  qapi: Fix qcow2 encryption doc typo

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 16abfb36 96566d09

accel/kvm/kvm-all.c

+3 −0
Original line number Diff line number Diff line
@@ -657,6 +657,8 @@ static int kvm_set_ioeventfd_mmio(int fd, hwaddr addr, uint32_t val, 
        .fd = fd,

    };



    trace_kvm_set_ioeventfd_mmio(fd, (uint64_t)addr, val, assign, size,

                                 datamatch);

    if (!kvm_enabled()) {

        return -ENOSYS;

    }
@@ -688,6 +690,7 @@ static int kvm_set_ioeventfd_pio(int fd, uint16_t addr, uint16_t val, 
        .fd = fd,

    };

    int r;

    trace_kvm_set_ioeventfd_pio(fd, addr, val, assign, size, datamatch);

    if (!kvm_enabled()) {

        return -ENOSYS;

    }

accel/kvm/trace-events

+2 −0
Original line number Diff line number Diff line
@@ -12,5 +12,7 @@ kvm_irqchip_commit_routes(void) "" 
kvm_irqchip_add_msi_route(char *name, int vector, int virq) "dev %s vector %d virq %d"

kvm_irqchip_update_msi_route(int virq) "Updating MSI route virq=%d"

kvm_irqchip_release_virq(int virq) "virq %d"

kvm_set_ioeventfd_mmio(int fd, uint64_t addr, uint32_t val, bool assign, uint32_t size, bool datamatch) "fd: %d @0x%" PRIx64 " val=0x%x assign: %d size: %d match: %d"

kvm_set_ioeventfd_pio(int fd, uint16_t addr, uint32_t val, bool assign, uint32_t size, bool datamatch) "fd: %d @0x%x val=0x%x assign: %d size: %d match: %d"

kvm_set_user_memory(uint32_t slot, uint32_t flags, uint64_t guest_phys_addr, uint64_t memory_size, uint64_t userspace_addr, int ret) "Slot#%d flags=0x%x gpa=0x%"PRIx64 " size=0x%"PRIx64 " ua=0x%"PRIx64 " ret=%d"

audio/wavcapture.c

+17 −22
Original line number Diff line number Diff line
@@ -38,29 +38,28 @@ static void wav_destroy (void *opaque) 
    uint8_t dlen[4];

    uint32_t datalen = wav->bytes;

    uint32_t rifflen = datalen + 36;

    Monitor *mon = cur_mon;



    if (wav->f) {

        le_store (rlen, rifflen, 4);

        le_store (dlen, datalen, 4);



        if (fseek (wav->f, 4, SEEK_SET)) {

            monitor_printf (mon, "wav_destroy: rlen fseek failed\nReason: %s\n",

            error_report("wav_destroy: rlen fseek failed: %s",

                         strerror(errno));

            goto doclose;

        }

        if (fwrite (rlen, 4, 1, wav->f) != 1) {

            monitor_printf (mon, "wav_destroy: rlen fwrite failed\nReason %s\n",

            error_report("wav_destroy: rlen fwrite failed: %s",

                         strerror(errno));

            goto doclose;

        }

        if (fseek (wav->f, 32, SEEK_CUR)) {

            monitor_printf (mon, "wav_destroy: dlen fseek failed\nReason %s\n",

            error_report("wav_destroy: dlen fseek failed: %s",

                         strerror(errno));

            goto doclose;

        }

        if (fwrite (dlen, 1, 4, wav->f) != 4) {

            monitor_printf (mon, "wav_destroy: dlen fwrite failed\nReason %s\n",

            error_report("wav_destroy: dlen fwrite failed: %s",

                         strerror(errno));

            goto doclose;

        }
@@ -78,8 +77,7 @@ static void wav_capture (void *opaque, void *buf, int size) 
    WAVState *wav = opaque;



    if (fwrite (buf, size, 1, wav->f) != 1) {

        monitor_printf (cur_mon, "wav_capture: fwrite error\nReason: %s",

                        strerror (errno));

        error_report("wav_capture: fwrite error: %s", strerror(errno));

    }

    wav->bytes += size;

}
@@ -110,7 +108,6 @@ static struct capture_ops wav_capture_ops = { 
int wav_start_capture (CaptureState *s, const char *path, int freq,

                       int bits, int nchannels)

{

    Monitor *mon = cur_mon;

    WAVState *wav;

    uint8_t hdr[] = {

        0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x41, 0x56,
@@ -124,12 +121,12 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, 
    CaptureVoiceOut *cap;



    if (bits != 8 && bits != 16) {

        monitor_printf (mon, "incorrect bit count %d, must be 8 or 16\n", bits);

        error_report("incorrect bit count %d, must be 8 or 16", bits);

        return -1;

    }



    if (nchannels != 1 && nchannels != 2) {

        monitor_printf (mon, "incorrect channel count %d, must be 1 or 2\n",

        error_report("incorrect channel count %d, must be 1 or 2",

                     nchannels);

        return -1;

    }
@@ -158,7 +155,7 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, 


    wav->f = fopen (path, "wb");

    if (!wav->f) {

        monitor_printf (mon, "Failed to open wave file `%s'\nReason: %s\n",

        error_report("Failed to open wave file `%s': %s",

                     path, strerror(errno));

        g_free (wav);

        return -1;
@@ -170,14 +167,13 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, 
    wav->freq = freq;



    if (fwrite (hdr, sizeof (hdr), 1, wav->f) != 1) {

        monitor_printf (mon, "Failed to write header\nReason: %s\n",

                        strerror (errno));

        error_report("Failed to write header: %s", strerror(errno));

        goto error_free;

    }



    cap = AUD_add_capture (&as, &ops, wav);

    if (!cap) {

        monitor_printf (mon, "Failed to add audio capture\n");

        error_report("Failed to add audio capture");

        goto error_free;

    }
@@ -189,8 +185,7 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, 
error_free:

    g_free (wav->path);

    if (fclose (wav->f)) {

        monitor_printf (mon, "Failed to close wave file\nReason: %s\n",

                        strerror (errno));

        error_report("Failed to close wave file: %s", strerror(errno));

    }

    g_free (wav);

    return -1;

configure

+19 −8
Original line number Diff line number Diff line
@@ -817,6 +817,7 @@ DragonFly) 
;;

NetBSD)

  bsd="yes"

  hax="yes"

  make="${MAKE-gmake}"

  audio_drv_list="oss try-sdl"

  audio_possible_drivers="oss sdl"
@@ -1768,7 +1769,7 @@ disabled with --disable-FEATURE, default is enabled if available: 
  virglrenderer   virgl rendering support

  xfsctl          xfsctl support

  qom-cast-debug  cast debugging support

  tools           build qemu-io, qemu-nbd and qemu-image tools

  tools           build qemu-io, qemu-nbd and qemu-img tools

  vxhs            Veritas HyperScale vDisk backend support

  bochs           bochs image format support

  cloop           cloop image format support
@@ -1881,7 +1882,6 @@ gcc_flags="-Wno-missing-include-dirs -Wempty-body -Wnested-externs $gcc_flags" 
gcc_flags="-Wendif-labels -Wno-shift-negative-value $gcc_flags"

gcc_flags="-Wno-initializer-overrides -Wexpansion-to-defined $gcc_flags"

gcc_flags="-Wno-string-plus-int $gcc_flags"

gcc_flags="-Wno-error=address-of-packed-member $gcc_flags"

# Note that we do not add -Werror to gcc_flags here, because that would

# enable it for all configure tests. If a configure test failed due

# to -Werror this would just silently disable some features,
@@ -3350,10 +3350,6 @@ for drv in $audio_drv_list; do 
      oss_libs="$oss_lib"

    ;;



    wav)

    # XXX: Probes for CoreAudio, DirectSound

    ;;



    *)

    echo "$audio_possible_drivers" | grep -q "\<$drv\>" || {

        error_exit "Unknown driver '$drv' selected" \
@@ -4266,10 +4262,25 @@ fi 
# check for usbfs

have_usbfs=no

if test "$linux_user" = "yes"; then

  if check_include linux/usbdevice_fs.h; then

  cat > $TMPC << EOF

#include <linux/usbdevice_fs.h>



#ifndef USBDEVFS_GET_CAPABILITIES

#error "USBDEVFS_GET_CAPABILITIES undefined"

#endif



#ifndef USBDEVFS_DISCONNECT_CLAIM

#error "USBDEVFS_DISCONNECT_CLAIM undefined"

#endif



int main(void)

{

    return 0;

}

EOF

  if compile_prog "" ""; then

    have_usbfs=yes

  fi

  have_usbfs=yes

fi



# check for fallocate

hmp.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void hmp_handle_error(Monitor *mon, Error **errp) 
{

    assert(errp);

    if (*errp) {

        error_report_err(*errp);

        error_reportf_err(*errp, "Error: ");

    }

}